From 78a45788ca882d45c1a4e85938e9a03476032a7b Mon Sep 17 00:00:00 2001 From: ivagin Date: Wed, 11 Jun 2025 13:43:42 +0300 Subject: [PATCH 1/2] Moved static_core/libpandabase Issue: ICEF8V Signed-off-by: ivagin --- ets2panda/test/unit/plugin/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/ets2panda/test/unit/plugin/CMakeLists.txt b/ets2panda/test/unit/plugin/CMakeLists.txt index 672aff08e4..35a4949637 100644 --- a/ets2panda/test/unit/plugin/CMakeLists.txt +++ b/ets2panda/test/unit/plugin/CMakeLists.txt @@ -134,7 +134,6 @@ foreach(TEST_DATA IN ITEMS ${PLUGIN_TESTS}) endif() panda_target_include_directories(${TEST_NAME} PRIVATE ${ES2PANDA_PATH} - PRIVATE ${PANDA_ROOT}/libpandafile PRIVATE ${PANDA_ROOT}/assembler PRIVATE ${OUTPUT_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} -- Gitee From 8bd66fe44da67ae96410196cd1841487fda7b529 Mon Sep 17 00:00:00 2001 From: ivagin Date: Wed, 11 Jun 2025 13:45:44 +0300 Subject: [PATCH 2/2] Absolute libpandabase includes Issue: ICEF8V Signed-off-by: ivagin --- ets2panda/aot/main.cpp | 6 +++--- ets2panda/ast_verifier/ASTVerifier.h | 2 +- ets2panda/ast_verifier/invariantBase.h | 2 +- ets2panda/bindings/native/src/win-dynamic-node.cpp | 2 +- ets2panda/checker/IsolatedDeclgenChecker.cpp | 4 ++-- ets2panda/checker/IsolatedDeclgenChecker.h | 2 +- ets2panda/checker/ets/aliveAnalyzer.h | 2 +- ets2panda/checker/ets/assignAnalyzer.h | 2 +- ets2panda/checker/ets/baseAnalyzer.h | 2 +- ets2panda/checker/ets/function_helpers.h | 2 +- ets2panda/checker/ts/destructuringContext.h | 2 +- ets2panda/checker/ts/typeElaborationContext.h | 2 +- ets2panda/compiler/core/compileQueue.h | 2 +- ets2panda/compiler/lowering/ets/arrayLiteralLowering.cpp | 2 +- ets2panda/compiler/lowering/ets/arrayLiteralLowering.h | 2 +- ets2panda/compiler/lowering/ets/enumPostCheckLowering.cpp | 2 +- ets2panda/compiler/lowering/ets/exportAnonymousConst.cpp | 2 +- ets2panda/compiler/lowering/ets/objectIterator.cpp | 2 +- ets2panda/compiler/lowering/ets/stringComparison.cpp | 2 +- .../lowering/ets/topLevelStmts/globalClassHandler.cpp | 2 +- ets2panda/compiler/lowering/phase.h | 2 +- ets2panda/declgen_ets2ts/declgenEts2Ts.h | 4 ++-- .../evaluate/debugInfoDeserialization/classBuilder.h | 2 +- .../debugInfoDeserialization/debugInfoDeserializer.h | 2 +- .../evaluate/debugInfoDeserialization/methodBuilder.h | 2 +- ets2panda/evaluate/entityDeclarator.h | 2 +- ets2panda/evaluate/evaluateContext.h | 2 +- ets2panda/evaluate/importExportTable.h | 2 +- ets2panda/evaluate/irCheckHelper.h | 4 ++-- ets2panda/evaluate/pathResolver.h | 2 +- ets2panda/evaluate/proxyProgramsCache.h | 4 ++-- ets2panda/ir/base/scriptFunction.cpp | 4 ++-- ets2panda/ir/ets/etsModule.cpp | 2 +- ets2panda/ir/irnode.h | 2 +- ets2panda/ir/module/importDeclaration.cpp | 2 +- ets2panda/ir/statements/blockStatement.cpp | 2 +- ets2panda/ir/statements/blockStatement.h | 2 +- ets2panda/ir/statements/variableDeclaration.cpp | 2 +- ets2panda/ir/ts/tsEnumDeclaration.cpp | 2 +- ets2panda/ir/ts/tsInterfaceDeclaration.cpp | 2 +- ets2panda/ir/ts/tsTypeParameter.cpp | 2 +- ets2panda/lexer/keywordsUtil.h | 2 +- ets2panda/lexer/templates/keywords.h.erb | 2 +- ets2panda/lexer/token/sourceLocation.h | 2 +- ets2panda/lsp/include/create_type_help_items.h | 2 +- ets2panda/lsp/src/classifier.cpp | 6 +++--- ets2panda/lsp/src/create_type_help_items.cpp | 2 +- ets2panda/lsp/src/get_adjusted_location.cpp | 2 +- ets2panda/lsp/src/get_class_property_info.cpp | 2 +- ets2panda/lsp/src/inlay_hints.cpp | 2 +- ets2panda/lsp/src/internal_api.cpp | 4 ++-- ets2panda/lsp/src/rename.cpp | 2 +- ets2panda/lsp/src/signature_help.cpp | 2 +- ets2panda/lsp/src/signature_help_items.cpp | 2 +- ets2panda/lsp/src/suggestion_diagnostics.cpp | 2 +- ets2panda/parser/ETSparser.cpp | 2 +- ets2panda/parser/ETSparserClasses.cpp | 2 +- ets2panda/parser/ETSparserEnums.cpp | 2 +- ets2panda/parser/ETSparserNamespaces.cpp | 2 +- ets2panda/parser/ETSparserStatements.cpp | 2 +- ets2panda/parser/ETSparserTypes.cpp | 2 +- ets2panda/parser/context/classPrivateContext.h | 2 +- ets2panda/parser/program/entityNameVisitor.h | 2 +- ets2panda/parser/program/program.cpp | 2 +- ets2panda/parser/program/program.h | 4 ++-- ets2panda/public/public.h | 2 +- ets2panda/test/depanalyzer/path_getter.h.erb | 2 +- ets2panda/test/depanalyzer/test.cpp | 4 ++-- ets2panda/test/unit/annotations/annotations_emit_test.h | 2 +- ets2panda/test/unit/ast_dumper_test.cpp | 8 ++++---- ets2panda/test/unit/checker_test.cpp | 2 +- ets2panda/test/unit/ets_specific_optimizer/ets_opt.h | 8 ++++---- ets2panda/test/unit/extern_flag_test.cpp | 6 +++--- ets2panda/test/unit/globalETSObjectType_test.cpp | 4 ++-- ets2panda/test/unit/lowerings/scopes_initialization.cpp | 2 +- ets2panda/test/unit/lsp/create_type_help_items_test.cpp | 2 +- ets2panda/test/unit/plugin/plugin_proceed_to_state.cpp | 2 +- .../plugin/plugin_proceed_to_state_change_call_lambda.cpp | 2 +- .../unit/plugin/plugin_proceed_to_state_change_func.cpp | 2 +- .../unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp | 2 +- .../unit/plugin/plugin_proceed_to_state_checker_type.cpp | 2 +- .../plugin/plugin_proceed_to_state_create_annotation.cpp | 2 +- .../unit/plugin/plugin_proceed_to_state_create_import.cpp | 4 ++-- ...ugin_proceed_to_state_create_interface_declaration.cpp | 2 +- .../plugin_proceed_to_state_dynamic_class_recheck.cpp | 2 +- .../plugin/plugin_proceed_to_state_function_to_arrow.cpp | 2 +- .../unit/plugin/plugin_proceed_to_state_is_accessor.cpp | 2 +- .../plugin/plugin_proceed_to_state_member_expression.cpp | 2 +- .../unit/plugin/plugin_proceed_to_state_misc_expr.cpp | 2 +- .../plugin/plugin_proceed_to_state_misc_expression.cpp | 2 +- .../plugin/plugin_proceed_to_state_new_expression.cpp | 2 +- .../plugin/plugin_proceed_to_state_return_expression.cpp | 2 +- .../plugin/plugin_proceed_to_state_string_optimize.cpp | 2 +- .../plugin_proceed_to_state_test_annotation_change.cpp | 2 +- ...plugin_proceed_to_state_test_class_decl_annotation.cpp | 2 +- .../plugin/plugin_proceed_to_state_this_into_method.cpp | 2 +- .../unit/plugin/plugin_proceed_to_state_update_class.cpp | 2 +- .../plugin/plugin_proceed_to_state_update_statements.cpp | 2 +- .../plugin_proceed_to_state_update_statements_lambda.cpp | 2 +- .../test/unit/plugin/use_plugin_to_test_export_table.cpp | 4 ++-- ets2panda/test/unit/plugin/util.cpp | 2 +- ets2panda/test/unit/plugin/util.h | 2 +- .../plugin_conversion_rule_unit_test.h | 2 +- ets2panda/test/unit/public/ast_builder_test.cpp | 2 +- ets2panda/test/unit/public/ast_verifier_short_test.cpp | 2 +- ets2panda/test/unit/public/es2panda_public_test.cpp | 2 +- ets2panda/test/unit/rest_parameter_flag_test.cpp | 6 +++--- ets2panda/test/unit/union_normalization_test_1.cpp | 4 ++-- ets2panda/test/unit/union_normalization_test_2.cpp | 4 ++-- ets2panda/test/utils/panda_executable_path_getter.cpp | 2 +- ets2panda/test/utils/plugin_conversion_rule_test.h | 2 +- ets2panda/test/utils/scope_init_test.h | 2 +- ets2panda/util/arktsconfig.cpp | 2 +- ets2panda/util/arktsconfig.h | 4 ++-- .../util/ast-builders/arrowFunctionExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/assignmentExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/astBuilder.h | 2 +- ets2panda/util/ast-builders/awaitExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/bigintLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/binaryExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/blockExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/blockStatementBuilder.h | 2 +- ets2panda/util/ast-builders/booleanLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/breakStatementBuilder.h | 2 +- ets2panda/util/ast-builders/callExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/catchClauseBuilder.h | 2 +- ets2panda/util/ast-builders/chainExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/charLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/classDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/classDefinitionBuilder.h | 2 +- ets2panda/util/ast-builders/classExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/classPropertyBuilder.h | 2 +- ets2panda/util/ast-builders/classStaticBlockBuilder.h | 2 +- .../util/ast-builders/conditionalExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/continueStatementBuilder.h | 2 +- ets2panda/util/ast-builders/debuggerStatementBuilder.h | 2 +- ets2panda/util/ast-builders/decoratorBuilder.h | 2 +- ets2panda/util/ast-builders/directEvalExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/doWhileStatementBuilder.h | 2 +- ets2panda/util/ast-builders/emptyStatementBuilder.h | 2 +- ets2panda/util/ast-builders/etsClassLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/etsFunctionTypeBuilder.h | 2 +- .../ast-builders/etsNewArrayInstanceExpressionBuilder.h | 2 +- .../ast-builders/etsNewClassInstanceExpressionBuilder.h | 2 +- .../etsNewMultiDivArrayInstanceExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/etsNullTypeBuilder.h | 2 +- .../util/ast-builders/etsPackageDeclarationBuilder.h | 2 +- .../util/ast-builders/etsParameterExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/etsPrimitiveTypeBuilder.h | 2 +- .../util/ast-builders/etsReExportDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/etsStructDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/etsTupleBuilder.h | 2 +- ets2panda/util/ast-builders/etsTypeReferenceBuilder.h | 2 +- ets2panda/util/ast-builders/etsTypeReferencePartBuilder.h | 2 +- ets2panda/util/ast-builders/etsUndefinedTypeBuilder.h | 2 +- ets2panda/util/ast-builders/etsUnionTypeBuilder.h | 2 +- ets2panda/util/ast-builders/etsWildcardTypeBuilder.h | 2 +- ets2panda/util/ast-builders/exportAllDeclarationBuilder.h | 2 +- .../util/ast-builders/exportDefaultDeclarationBuilder.h | 2 +- .../util/ast-builders/exportNamedDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/exportSpecifierBuilder.h | 2 +- ets2panda/util/ast-builders/expressionStatementBuilder.h | 2 +- ets2panda/util/ast-builders/forInStatementBuilder.h | 2 +- ets2panda/util/ast-builders/forOfStatementBuilder.h | 2 +- ets2panda/util/ast-builders/forUpdateStatementBuilder.h | 2 +- ets2panda/util/ast-builders/functionDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/functionExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/identifierBuilder.h | 2 +- ets2panda/util/ast-builders/ifStatementBuilder.h | 2 +- ets2panda/util/ast-builders/importDeclarationBuilder.h | 2 +- .../util/ast-builders/importDefaultSpecifierBuilder.h | 2 +- ets2panda/util/ast-builders/importExpressionBuilder.h | 2 +- .../util/ast-builders/importNamespaceSpecifierBuilder.h | 2 +- ets2panda/util/ast-builders/importSpecifierBuilder.h | 2 +- ets2panda/util/ast-builders/labelledStatementBuilder.h | 2 +- ets2panda/util/ast-builders/memberExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/metaPropertyBuilder.h | 2 +- ets2panda/util/ast-builders/methodDefinitionBuilder.h | 2 +- ets2panda/util/ast-builders/namedTypeBuilder.h | 2 +- ets2panda/util/ast-builders/newExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/nullLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/numberLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/omittedExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/opaqueTypeNodeBuilder.h | 2 +- .../util/ast-builders/prefixAssertionExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/propertyBuilder.h | 2 +- ets2panda/util/ast-builders/regExpLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/returnStatementBuilder.h | 2 +- ets2panda/util/ast-builders/scriptFunctionBuilder.h | 2 +- ets2panda/util/ast-builders/sequenceExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/stringLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/superExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/switchCaseStatementBuilder.h | 2 +- ets2panda/util/ast-builders/switchStatementBuilder.h | 2 +- .../util/ast-builders/taggedTemplateExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/templateElementBuilder.h | 2 +- ets2panda/util/ast-builders/templateLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/thisExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/throwStatementBuilder.h | 2 +- ets2panda/util/ast-builders/tryStatementBuilder.h | 2 +- ets2panda/util/ast-builders/tsAnyKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsArrayTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsAsExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/tsBigintKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsBooleanKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsClassImplementsBuilder.h | 2 +- ets2panda/util/ast-builders/tsConditionalTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsEnumDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/tsEnumMemberBuilder.h | 2 +- ets2panda/util/ast-builders/tsFunctionTypeBuilder.h | 2 +- .../util/ast-builders/tsImportEqualsDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/tsImportTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsIndexSignatureBuilder.h | 2 +- ets2panda/util/ast-builders/tsIndexedAccessTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsInferTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsInterfaceBodyBuilder.h | 2 +- ets2panda/util/ast-builders/tsInterfaceHeritageBuilder.h | 2 +- ets2panda/util/ast-builders/tsIntersectionTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsLiteralTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsMappedTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsMethodSignatureBuilder.h | 2 +- ets2panda/util/ast-builders/tsModuleBlockBuilder.h | 2 +- ets2panda/util/ast-builders/tsModuleDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/tsNamedTupleMemberBuilder.h | 2 +- ets2panda/util/ast-builders/tsNeverKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsNonNullExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/tsNullKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsNumberKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsObjectKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsParenthesizedTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsPropertySignatureBuilder.h | 2 +- .../util/ast-builders/tsSignatureDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/tsStringKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsThisTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsTupleTypeBuilder.h | 2 +- .../util/ast-builders/tsTypeAliasDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/tsTypeAssertionBuilder.h | 2 +- ets2panda/util/ast-builders/tsTypeLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/tsTypeOperatorBuilder.h | 2 +- ets2panda/util/ast-builders/tsTypeParameterBuilder.h | 2 +- .../util/ast-builders/tsTypeParameterDeclarationBuilder.h | 2 +- .../ast-builders/tsTypeParameterInstantiationBuilder.h | 2 +- ets2panda/util/ast-builders/tsTypePredicateBuilder.h | 2 +- ets2panda/util/ast-builders/tsTypeQueryBuilder.h | 2 +- ets2panda/util/ast-builders/tsTypeReferenceBuilder.h | 2 +- ets2panda/util/ast-builders/tsUndefinedKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsUnionTypeBuilder.h | 2 +- ets2panda/util/ast-builders/tsUnknownKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/tsVoidKeywordBuilder.h | 2 +- ets2panda/util/ast-builders/typeofExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/unaryExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/undefinedLiteralBuilder.h | 2 +- ets2panda/util/ast-builders/updateExpressionBuilder.h | 2 +- ets2panda/util/ast-builders/variableDeclarationBuilder.h | 2 +- ets2panda/util/ast-builders/variableDeclaratorBuilder.h | 2 +- ets2panda/util/ast-builders/whileStatementBuilder.h | 2 +- ets2panda/util/ast-builders/yieldExpressionBuilder.h | 2 +- ets2panda/util/doubleLinkedList.h | 2 +- ets2panda/util/dtoa_helper.cpp | 4 ++-- ets2panda/util/dtoa_helper.h | 2 +- ets2panda/util/es2pandaMacros.h | 2 +- ets2panda/util/helpers.cpp | 2 +- ets2panda/util/helpers.h | 2 +- ets2panda/util/importPathManager.cpp | 2 +- ets2panda/util/options.cpp | 4 ++-- ets2panda/util/options.h | 6 +++--- ets2panda/util/path.cpp | 2 +- ets2panda/util/plugin.cpp | 2 +- ets2panda/util/plugin.h | 2 +- ets2panda/util/ustring.h | 2 +- ets2panda/varbinder/recordTable.h | 2 +- 271 files changed, 303 insertions(+), 303 deletions(-) diff --git a/ets2panda/aot/main.cpp b/ets2panda/aot/main.cpp index 411df8364a..b209f7b6c5 100644 --- a/ets2panda/aot/main.cpp +++ b/ets2panda/aot/main.cpp @@ -16,15 +16,15 @@ #include "bytecode_optimizer/bytecodeopt_options.h" #include "bytecode_optimizer/optimize_bytecode.h" #include "compiler/compiler_logger.h" -#include "mem/arena_allocator.h" -#include "mem/pool_manager.h" +#include "../libarkbase/mem/arena_allocator.h" +#include "../libarkbase/mem/pool_manager.h" #include "es2panda.h" #include "util/arktsconfig.h" #include "util/diagnosticEngine.h" #include "util/generateBin.h" #include "util/options.h" #include "util/plugin.h" -#include "libpandabase/os/stacktrace.h" +#include "../libarkbase/os/stacktrace.h" #include "generated/diagnostic.h" #include diff --git a/ets2panda/ast_verifier/ASTVerifier.h b/ets2panda/ast_verifier/ASTVerifier.h index 9aaa1aecc3..e43a92fe19 100644 --- a/ets2panda/ast_verifier/ASTVerifier.h +++ b/ets2panda/ast_verifier/ASTVerifier.h @@ -50,7 +50,7 @@ #include "parser/program/program.h" #include "util/ustring.h" #include "util/options.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "varbinder/variable.h" #include "public/public.h" diff --git a/ets2panda/ast_verifier/invariantBase.h b/ets2panda/ast_verifier/invariantBase.h index 7ce416e98a..b30fe63375 100644 --- a/ets2panda/ast_verifier/invariantBase.h +++ b/ets2panda/ast_verifier/invariantBase.h @@ -18,7 +18,7 @@ #include "generated/options.h" #include "ir/astNode.h" -#include "utils/json_builder.h" +#include "../libarkbase/utils/json_builder.h" namespace ark::es2panda::compiler::ast_verifier { diff --git a/ets2panda/bindings/native/src/win-dynamic-node.cpp b/ets2panda/bindings/native/src/win-dynamic-node.cpp index 85bb3cb4da..461b961fe8 100644 --- a/ets2panda/bindings/native/src/win-dynamic-node.cpp +++ b/ets2panda/bindings/native/src/win-dynamic-node.cpp @@ -16,7 +16,7 @@ #include #include #include "node_api.h" -#include +#include <../libarkbase/macros.h> #define NAPI_CDECL __cdecl diff --git a/ets2panda/checker/IsolatedDeclgenChecker.cpp b/ets2panda/checker/IsolatedDeclgenChecker.cpp index ed623f5cb4..f23742135b 100644 --- a/ets2panda/checker/IsolatedDeclgenChecker.cpp +++ b/ets2panda/checker/IsolatedDeclgenChecker.cpp @@ -14,8 +14,8 @@ */ #include "checker/IsolatedDeclgenChecker.h" -#include "clang.h" -#include "utils/logger.h" +#include "../libarkbase/clang.h" +#include "../libarkbase/utils/logger.h" namespace ark::es2panda::checker { using AstNodePtr = ir::AstNode *; diff --git a/ets2panda/checker/IsolatedDeclgenChecker.h b/ets2panda/checker/IsolatedDeclgenChecker.h index eef54b0232..83466d5044 100644 --- a/ets2panda/checker/IsolatedDeclgenChecker.h +++ b/ets2panda/checker/IsolatedDeclgenChecker.h @@ -16,7 +16,7 @@ #define ES2PANDA_CHECKER_ISOLATED_DECLGEN_CHECKER_H #include -#include "macros.h" +#include "../libarkbase/macros.h" #include "checker/checker.h" namespace ark::es2panda::checker { diff --git a/ets2panda/checker/ets/aliveAnalyzer.h b/ets2panda/checker/ets/aliveAnalyzer.h index ade9092244..f400e90356 100644 --- a/ets2panda/checker/ets/aliveAnalyzer.h +++ b/ets2panda/checker/ets/aliveAnalyzer.h @@ -19,7 +19,7 @@ #include "checker/ETSchecker.h" #include "checker/ets/baseAnalyzer.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::ir { class AstNode; diff --git a/ets2panda/checker/ets/assignAnalyzer.h b/ets2panda/checker/ets/assignAnalyzer.h index 621a24ba9e..96ca6df537 100644 --- a/ets2panda/checker/ets/assignAnalyzer.h +++ b/ets2panda/checker/ets/assignAnalyzer.h @@ -19,7 +19,7 @@ #include "checker/ETSchecker.h" #include "checker/ets/baseAnalyzer.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::ir { class AstNode; diff --git a/ets2panda/checker/ets/baseAnalyzer.h b/ets2panda/checker/ets/baseAnalyzer.h index 8599c5d00a..943e8a5d3f 100644 --- a/ets2panda/checker/ets/baseAnalyzer.h +++ b/ets2panda/checker/ets/baseAnalyzer.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_BASE_ANALYZER_H #define ES2PANDA_COMPILER_CHECKER_ETS_BASE_ANALYZER_H -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "util/enumbitops.h" namespace ark::es2panda::ir { diff --git a/ets2panda/checker/ets/function_helpers.h b/ets2panda/checker/ets/function_helpers.h index 2ed4c6b430..6321eebe5b 100644 --- a/ets2panda/checker/ets/function_helpers.h +++ b/ets2panda/checker/ets/function_helpers.h @@ -40,7 +40,7 @@ #include "ir/statements/whileStatement.h" #include "ir/ts/tsTypeParameterInstantiation.h" #include "parser/program/program.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "util/helpers.h" #include "util/language.h" #include "varbinder/declaration.h" diff --git a/ets2panda/checker/ts/destructuringContext.h b/ets2panda/checker/ts/destructuringContext.h index 5721379cc4..5994ba742f 100644 --- a/ets2panda/checker/ts/destructuringContext.h +++ b/ets2panda/checker/ts/destructuringContext.h @@ -19,7 +19,7 @@ #include "checker/TSchecker.h" #include "ir/expression.h" -#include +#include <../libarkbase/macros.h> namespace ark::es2panda::ir { class Expression; diff --git a/ets2panda/checker/ts/typeElaborationContext.h b/ets2panda/checker/ts/typeElaborationContext.h index d89fa406cb..4391819152 100644 --- a/ets2panda/checker/ts/typeElaborationContext.h +++ b/ets2panda/checker/ts/typeElaborationContext.h @@ -19,7 +19,7 @@ #include "checker/TSchecker.h" #include "ir/expression.h" -#include +#include <../libarkbase/macros.h> namespace ark::es2panda::ir { class Expression; diff --git a/ets2panda/compiler/core/compileQueue.h b/ets2panda/compiler/core/compileQueue.h index 7bc948033b..360968adf0 100644 --- a/ets2panda/compiler/core/compileQueue.h +++ b/ets2panda/compiler/core/compileQueue.h @@ -17,7 +17,7 @@ #define ES2PANDA_COMPILER_CORE_COMPILE_QUEUE_H #include "util/es2pandaMacros.h" -#include "os/thread.h" +#include "../libarkbase/os/thread.h" #include "es2panda.h" #include "compiler/core/compileJob.h" #include "util/diagnostic.h" diff --git a/ets2panda/compiler/lowering/ets/arrayLiteralLowering.cpp b/ets2panda/compiler/lowering/ets/arrayLiteralLowering.cpp index 42a8564a0f..5743b72a22 100644 --- a/ets2panda/compiler/lowering/ets/arrayLiteralLowering.cpp +++ b/ets2panda/compiler/lowering/ets/arrayLiteralLowering.cpp @@ -24,7 +24,7 @@ #include "lexer/token/number.h" #include "util/es2pandaMacros.h" #include "checker/ETSchecker.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::compiler { diff --git a/ets2panda/compiler/lowering/ets/arrayLiteralLowering.h b/ets2panda/compiler/lowering/ets/arrayLiteralLowering.h index ef2d297553..2b1d088547 100644 --- a/ets2panda/compiler/lowering/ets/arrayLiteralLowering.h +++ b/ets2panda/compiler/lowering/ets/arrayLiteralLowering.h @@ -22,7 +22,7 @@ #include "ir/ets/etsNewArrayInstanceExpression.h" #include "ir/ts/tsArrayType.h" #include "parser/ETSparser.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "varbinder/ETSBinder.h" namespace ark::es2panda::compiler { diff --git a/ets2panda/compiler/lowering/ets/enumPostCheckLowering.cpp b/ets2panda/compiler/lowering/ets/enumPostCheckLowering.cpp index abd8401d58..2ecbe8776b 100644 --- a/ets2panda/compiler/lowering/ets/enumPostCheckLowering.cpp +++ b/ets2panda/compiler/lowering/ets/enumPostCheckLowering.cpp @@ -24,7 +24,7 @@ #include "ir/expressions/identifier.h" #include "ir/statements/ifStatement.h" #include "ir/ts/tsAsExpression.h" -#include "macros.h" +#include "../libarkbase/macros.h" #include "parser/ETSparser.h" #include "util.h" #include "util/ustring.h" diff --git a/ets2panda/compiler/lowering/ets/exportAnonymousConst.cpp b/ets2panda/compiler/lowering/ets/exportAnonymousConst.cpp index d67d756dec..08a86bdb0a 100644 --- a/ets2panda/compiler/lowering/ets/exportAnonymousConst.cpp +++ b/ets2panda/compiler/lowering/ets/exportAnonymousConst.cpp @@ -15,7 +15,7 @@ #include "compiler/lowering/ets/exportAnonymousConst.h" #include "compiler/lowering/util.h" -#include "macros.h" +#include "../libarkbase/macros.h" namespace ark::es2panda::compiler { diff --git a/ets2panda/compiler/lowering/ets/objectIterator.cpp b/ets2panda/compiler/lowering/ets/objectIterator.cpp index c3136f256e..981ad037f1 100644 --- a/ets2panda/compiler/lowering/ets/objectIterator.cpp +++ b/ets2panda/compiler/lowering/ets/objectIterator.cpp @@ -32,7 +32,7 @@ #include "objectIterator.h" #include "generated/signatures.h" -#include "macros.h" +#include "../libarkbase/macros.h" #include "parser/ETSparser.h" #include "compiler/lowering/util.h" #include "compiler/lowering/scopesInit/scopesInitPhase.h" diff --git a/ets2panda/compiler/lowering/ets/stringComparison.cpp b/ets2panda/compiler/lowering/ets/stringComparison.cpp index 056f7b216c..5098da52d8 100644 --- a/ets2panda/compiler/lowering/ets/stringComparison.cpp +++ b/ets2panda/compiler/lowering/ets/stringComparison.cpp @@ -17,7 +17,7 @@ #include "stringComparison.h" #include "checker/ETSchecker.h" #include "parser/parserImpl.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "compiler/lowering/scopesInit/scopesInitPhase.h" #include "compiler/lowering/util.h" diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp index 80d07a9441..eacd5552ba 100644 --- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp +++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp @@ -30,7 +30,7 @@ #include "ir/statements/blockStatement.h" #include "util/helpers.h" #include "util/ustring.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "generated/diagnostic.h" namespace ark::es2panda::compiler { diff --git a/ets2panda/compiler/lowering/phase.h b/ets2panda/compiler/lowering/phase.h index 63c3e493f4..ba06a0d428 100644 --- a/ets2panda/compiler/lowering/phase.h +++ b/ets2panda/compiler/lowering/phase.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_LOWERING_PHASE_H #define ES2PANDA_COMPILER_LOWERING_PHASE_H -#include "macros.h" +#include "../libarkbase/macros.h" #include "parser/program/program.h" #include "public/public.h" #include "phase_id.h" diff --git a/ets2panda/declgen_ets2ts/declgenEts2Ts.h b/ets2panda/declgen_ets2ts/declgenEts2Ts.h index fda8c826a1..21add0d63a 100644 --- a/ets2panda/declgen_ets2ts/declgenEts2Ts.h +++ b/ets2panda/declgen_ets2ts/declgenEts2Ts.h @@ -18,8 +18,8 @@ #include "parser/program/program.h" #include "checker/ETSchecker.h" -#include "libpandabase/os/file.h" -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/os/file.h" +#include "../libarkbase/utils/arena_containers.h" #include "util/options.h" #include "util/diagnosticEngine.h" diff --git a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h index 4d01ef2e30..b89c1b9663 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h +++ b/ets2panda/evaluate/debugInfoDeserialization/classBuilder.h @@ -18,7 +18,7 @@ #include "ir/base/classDefinition.h" #include "util/ustring.h" -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::panda_file { class ClassDataAccessor; diff --git a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h index fe5e9ac7d3..eb47ee0002 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h +++ b/ets2panda/evaluate/debugInfoDeserialization/debugInfoDeserializer.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_EVALUATE_DEBUG_INFO_DESERIALIZER_H #define ES2PANDA_EVALUATE_DEBUG_INFO_DESERIALIZER_H -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "libpandafile/debug_info_extractor.h" #include "libpandafile/file.h" diff --git a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h index 7a1c5d6305..da0cc95372 100644 --- a/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h +++ b/ets2panda/evaluate/debugInfoDeserialization/methodBuilder.h @@ -19,7 +19,7 @@ #include "util/ustring.h" #include "ir/astNodeFlags.h" #include "generated/signatures.h" -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::panda_file { class ClassDataAccessor; diff --git a/ets2panda/evaluate/entityDeclarator.h b/ets2panda/evaluate/entityDeclarator.h index 234d3007fb..4a5f78f576 100644 --- a/ets2panda/evaluate/entityDeclarator.h +++ b/ets2panda/evaluate/entityDeclarator.h @@ -19,7 +19,7 @@ #include "checker/ETSchecker.h" #include "evaluate/proxyProgramsCache.h" #include "evaluate/helpers.h" -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::parser { class Program; diff --git a/ets2panda/evaluate/evaluateContext.h b/ets2panda/evaluate/evaluateContext.h index 848719954f..f384eb67d3 100644 --- a/ets2panda/evaluate/evaluateContext.h +++ b/ets2panda/evaluate/evaluateContext.h @@ -19,7 +19,7 @@ #include "util/ustring.h" #include "util/options.h" -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "libpandafile/debug_info_extractor.h" #include "libpandafile/file.h" diff --git a/ets2panda/evaluate/importExportTable.h b/ets2panda/evaluate/importExportTable.h index 35f00ca3bb..5859348a3c 100644 --- a/ets2panda/evaluate/importExportTable.h +++ b/ets2panda/evaluate/importExportTable.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_EVALUATE_IMPORT_EXPORT_TABLE_H #define ES2PANDA_EVALUATE_IMPORT_EXPORT_TABLE_H -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/irCheckHelper.h b/ets2panda/evaluate/irCheckHelper.h index 01b034fd87..f246598d2a 100644 --- a/ets2panda/evaluate/irCheckHelper.h +++ b/ets2panda/evaluate/irCheckHelper.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_EVALUATE_NON_RECURSIVE_IR_CHECKER_H #define ES2PANDA_EVALUATE_NON_RECURSIVE_IR_CHECKER_H -#include "libpandabase/mem/arena_allocator.h" -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/mem/arena_allocator.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::checker { class ETSChecker; diff --git a/ets2panda/evaluate/pathResolver.h b/ets2panda/evaluate/pathResolver.h index e678a2240a..0d9ad949ae 100644 --- a/ets2panda/evaluate/pathResolver.h +++ b/ets2panda/evaluate/pathResolver.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_EVALUATE_PATH_RESOLVER_H #define ES2PANDA_EVALUATE_PATH_RESOLVER_H -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::evaluate { diff --git a/ets2panda/evaluate/proxyProgramsCache.h b/ets2panda/evaluate/proxyProgramsCache.h index 59211afa91..d263430803 100644 --- a/ets2panda/evaluate/proxyProgramsCache.h +++ b/ets2panda/evaluate/proxyProgramsCache.h @@ -18,8 +18,8 @@ #include "util/ustring.h" -#include "libpandabase/mem/arena_allocator.h" -#include "libpandabase/utils/arena_containers.h" +#include "../libarkbase/mem/arena_allocator.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::parser { class Program; diff --git a/ets2panda/ir/base/scriptFunction.cpp b/ets2panda/ir/base/scriptFunction.cpp index 73ef90390f..1ab1baaf22 100644 --- a/ets2panda/ir/base/scriptFunction.cpp +++ b/ets2panda/ir/base/scriptFunction.cpp @@ -20,8 +20,8 @@ #include "compiler/core/pandagen.h" #include "ir/astDump.h" #include "ir/srcDump.h" -#include "mem/arena_allocator.h" -#include "utils/arena_containers.h" +#include "../libarkbase/mem/arena_allocator.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::ir { diff --git a/ets2panda/ir/ets/etsModule.cpp b/ets2panda/ir/ets/etsModule.cpp index 4891a53166..fd81632c78 100644 --- a/ets2panda/ir/ets/etsModule.cpp +++ b/ets2panda/ir/ets/etsModule.cpp @@ -14,7 +14,7 @@ */ #include "etsModule.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::ir { diff --git a/ets2panda/ir/irnode.h b/ets2panda/ir/irnode.h index 84f269da1f..82f498b24a 100644 --- a/ets2panda/ir/irnode.h +++ b/ets2panda/ir/irnode.h @@ -22,7 +22,7 @@ #include "lexer/token/sourceLocation.h" #include "util/es2pandaMacros.h" #include "util/ustring.h" -#include "utils/span.h" +#include "../libarkbase/utils/span.h" #include #include diff --git a/ets2panda/ir/module/importDeclaration.cpp b/ets2panda/ir/module/importDeclaration.cpp index 161970f5f5..93bf19b456 100644 --- a/ets2panda/ir/module/importDeclaration.cpp +++ b/ets2panda/ir/module/importDeclaration.cpp @@ -20,7 +20,7 @@ #include "compiler/core/pandagen.h" #include "ir/astDump.h" #include "ir/srcDump.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::ir { diff --git a/ets2panda/ir/statements/blockStatement.cpp b/ets2panda/ir/statements/blockStatement.cpp index abbe7d12b0..46f8ad8657 100644 --- a/ets2panda/ir/statements/blockStatement.cpp +++ b/ets2panda/ir/statements/blockStatement.cpp @@ -22,7 +22,7 @@ #include "checker/ETSchecker.h" #include "ir/astDump.h" #include "ir/srcDump.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::ir { void BlockStatement::TransformChildren(const NodeTransformer &cb, std::string_view const transformationName) diff --git a/ets2panda/ir/statements/blockStatement.h b/ets2panda/ir/statements/blockStatement.h index e47670c061..059ee7720a 100644 --- a/ets2panda/ir/statements/blockStatement.h +++ b/ets2panda/ir/statements/blockStatement.h @@ -17,7 +17,7 @@ #define ES2PANDA_IR_STATEMENT_BLOCK_STATEMENT_H #include "ir/statement.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::checker { class ETSAnalyzer; diff --git a/ets2panda/ir/statements/variableDeclaration.cpp b/ets2panda/ir/statements/variableDeclaration.cpp index adbe853c54..8005fc0058 100644 --- a/ets2panda/ir/statements/variableDeclaration.cpp +++ b/ets2panda/ir/statements/variableDeclaration.cpp @@ -19,7 +19,7 @@ #include "checker/ETSchecker.h" #include "compiler/core/ETSGen.h" #include "compiler/core/pandagen.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::ir { diff --git a/ets2panda/ir/ts/tsEnumDeclaration.cpp b/ets2panda/ir/ts/tsEnumDeclaration.cpp index c3d9c28f02..f2f8dfc045 100644 --- a/ets2panda/ir/ts/tsEnumDeclaration.cpp +++ b/ets2panda/ir/ts/tsEnumDeclaration.cpp @@ -22,7 +22,7 @@ #include "util/helpers.h" #include "ir/astDump.h" #include "ir/srcDump.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::ir { diff --git a/ets2panda/ir/ts/tsInterfaceDeclaration.cpp b/ets2panda/ir/ts/tsInterfaceDeclaration.cpp index 4455a8b776..125dd6d593 100644 --- a/ets2panda/ir/ts/tsInterfaceDeclaration.cpp +++ b/ets2panda/ir/ts/tsInterfaceDeclaration.cpp @@ -16,7 +16,7 @@ #include "tsInterfaceDeclaration.h" #include "util/es2pandaMacros.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "varbinder/declaration.h" #include "varbinder/variable.h" #include "checker/TSchecker.h" diff --git a/ets2panda/ir/ts/tsTypeParameter.cpp b/ets2panda/ir/ts/tsTypeParameter.cpp index 4a8d253809..e969d045a9 100644 --- a/ets2panda/ir/ts/tsTypeParameter.cpp +++ b/ets2panda/ir/ts/tsTypeParameter.cpp @@ -22,7 +22,7 @@ #include "ir/srcDump.h" #include "ir/typeNode.h" #include "ir/expressions/identifier.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::ir { diff --git a/ets2panda/lexer/keywordsUtil.h b/ets2panda/lexer/keywordsUtil.h index 7c852b6975..aaee764496 100644 --- a/ets2panda/lexer/keywordsUtil.h +++ b/ets2panda/lexer/keywordsUtil.h @@ -22,7 +22,7 @@ #include "generated/tokenType.h" #include "util/es2pandaMacros.h" #include "util/ustring.h" -#include "utils/span.h" +#include "../libarkbase/utils/span.h" namespace ark::es2panda::lexer { class Lexer; diff --git a/ets2panda/lexer/templates/keywords.h.erb b/ets2panda/lexer/templates/keywords.h.erb index 97f76fe537..9ce494bbcf 100644 --- a/ets2panda/lexer/templates/keywords.h.erb +++ b/ets2panda/lexer/templates/keywords.h.erb @@ -19,7 +19,7 @@ #define ES2PANDA_LEXER_KEYWORDS_H #include "lexer/keywordsBase.h" -#include "utils/span.h" +#include "../libarkbase/utils/span.h" // NOLINTBEGIN(readability-identifier-naming) diff --git a/ets2panda/lexer/token/sourceLocation.h b/ets2panda/lexer/token/sourceLocation.h index b6557e4d63..df0cc78f1e 100644 --- a/ets2panda/lexer/token/sourceLocation.h +++ b/ets2panda/lexer/token/sourceLocation.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_LEXER_TOKEN_SOURCE_LOCATION_H #define ES2PANDA_LEXER_TOKEN_SOURCE_LOCATION_H -#include "macros.h" +#include "../libarkbase/macros.h" #include #include #include diff --git a/ets2panda/lsp/include/create_type_help_items.h b/ets2panda/lsp/include/create_type_help_items.h index 6ac398db55..554b90275d 100644 --- a/ets2panda/lsp/include/create_type_help_items.h +++ b/ets2panda/lsp/include/create_type_help_items.h @@ -20,7 +20,7 @@ #include #include "ir/astNode.h" #include "lexer/token/sourceLocation.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include #include #include diff --git a/ets2panda/lsp/src/classifier.cpp b/ets2panda/lsp/src/classifier.cpp index bd8d8a0ae9..e373884ec7 100644 --- a/ets2panda/lsp/src/classifier.cpp +++ b/ets2panda/lsp/src/classifier.cpp @@ -23,11 +23,11 @@ #include "internal_api.h" #include "ir/astNode.h" #include "lexer/lexer.h" -#include "macros.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/macros.h" +#include "../libarkbase/mem/arena_allocator.h" #include "public/es2panda_lib.h" #include "public/public.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "varbinder/declaration.h" namespace ark::es2panda::lsp { diff --git a/ets2panda/lsp/src/create_type_help_items.cpp b/ets2panda/lsp/src/create_type_help_items.cpp index e9c53ba842..1ff0423b94 100644 --- a/ets2panda/lsp/src/create_type_help_items.cpp +++ b/ets2panda/lsp/src/create_type_help_items.cpp @@ -16,7 +16,7 @@ #include "create_type_help_items.h" #include #include -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::lsp { diff --git a/ets2panda/lsp/src/get_adjusted_location.cpp b/ets2panda/lsp/src/get_adjusted_location.cpp index 77bce969e6..f199df0a63 100644 --- a/ets2panda/lsp/src/get_adjusted_location.cpp +++ b/ets2panda/lsp/src/get_adjusted_location.cpp @@ -21,7 +21,7 @@ #include "public/es2panda_lib.h" #include "public/public.h" #include "ir/astNodeFlags.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "util/options.h" using ark::es2panda::ir::AstNode; diff --git a/ets2panda/lsp/src/get_class_property_info.cpp b/ets2panda/lsp/src/get_class_property_info.cpp index 750d24fd84..377e3390a7 100644 --- a/ets2panda/lsp/src/get_class_property_info.cpp +++ b/ets2panda/lsp/src/get_class_property_info.cpp @@ -24,7 +24,7 @@ #include "get_class_property_info.h" #include "compiler/lowering/util.h" -#include "macros.h" +#include "../libarkbase/macros.h" namespace ark::es2panda::lsp { diff --git a/ets2panda/lsp/src/inlay_hints.cpp b/ets2panda/lsp/src/inlay_hints.cpp index 3a89585a1d..eb236d815e 100644 --- a/ets2panda/lsp/src/inlay_hints.cpp +++ b/ets2panda/lsp/src/inlay_hints.cpp @@ -20,7 +20,7 @@ #include "public/public.h" #include "internal_api.h" #include "cancellation_token.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::lsp { diff --git a/ets2panda/lsp/src/internal_api.cpp b/ets2panda/lsp/src/internal_api.cpp index 05c9922c14..e746ba9e24 100644 --- a/ets2panda/lsp/src/internal_api.cpp +++ b/ets2panda/lsp/src/internal_api.cpp @@ -23,10 +23,10 @@ #include "compiler/lowering/util.h" #include "ir/astNode.h" #include "lexer/token/sourceLocation.h" -#include "macros.h" +#include "../libarkbase/macros.h" #include "public/es2panda_lib.h" #include "public/public.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "formatting/formatting.h" #include "code_fix_provider.h" #include "get_class_property_info.h" diff --git a/ets2panda/lsp/src/rename.cpp b/ets2panda/lsp/src/rename.cpp index e836fb4858..f77660d747 100644 --- a/ets2panda/lsp/src/rename.cpp +++ b/ets2panda/lsp/src/rename.cpp @@ -15,7 +15,7 @@ #include "rename.h" #include "get_adjusted_location.h" -#include "macros.h" +#include "../libarkbase/macros.h" #include "lexer/token/letters.h" #include "public/public.h" #include diff --git a/ets2panda/lsp/src/signature_help.cpp b/ets2panda/lsp/src/signature_help.cpp index 58a726287f..170242f15b 100644 --- a/ets2panda/lsp/src/signature_help.cpp +++ b/ets2panda/lsp/src/signature_help.cpp @@ -15,7 +15,7 @@ #include "signature_help.h" #include "internal_api.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include #include #include diff --git a/ets2panda/lsp/src/signature_help_items.cpp b/ets2panda/lsp/src/signature_help_items.cpp index 01f5fc651f..45193efc6e 100644 --- a/ets2panda/lsp/src/signature_help_items.cpp +++ b/ets2panda/lsp/src/signature_help_items.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace ark::es2panda::lsp { diff --git a/ets2panda/lsp/src/suggestion_diagnostics.cpp b/ets2panda/lsp/src/suggestion_diagnostics.cpp index ae94deae2e..80078be6dc 100644 --- a/ets2panda/lsp/src/suggestion_diagnostics.cpp +++ b/ets2panda/lsp/src/suggestion_diagnostics.cpp @@ -15,7 +15,7 @@ #include "suggestion_diagnostics.h" #include "internal_api.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include #include #include diff --git a/ets2panda/parser/ETSparser.cpp b/ets2panda/parser/ETSparser.cpp index 36001a7946..0d09558aaa 100644 --- a/ets2panda/parser/ETSparser.cpp +++ b/ets2panda/parser/ETSparser.cpp @@ -25,7 +25,7 @@ #include "util/helpers.h" #include "util/language.h" #include "util/options.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "varbinder/varbinder.h" #include "varbinder/ETSBinder.h" #include "lexer/lexer.h" diff --git a/ets2panda/parser/ETSparserClasses.cpp b/ets2panda/parser/ETSparserClasses.cpp index 0876670671..debbbfb55d 100644 --- a/ets2panda/parser/ETSparserClasses.cpp +++ b/ets2panda/parser/ETSparserClasses.cpp @@ -22,7 +22,7 @@ #include "parser/parserStatusContext.h" #include "util/helpers.h" #include "util/language.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "varbinder/varbinder.h" #include "varbinder/ETSBinder.h" #include "lexer/lexer.h" diff --git a/ets2panda/parser/ETSparserEnums.cpp b/ets2panda/parser/ETSparserEnums.cpp index b38077398c..ee56b86404 100644 --- a/ets2panda/parser/ETSparserEnums.cpp +++ b/ets2panda/parser/ETSparserEnums.cpp @@ -22,7 +22,7 @@ #include "parser/parserStatusContext.h" #include "util/helpers.h" #include "util/language.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "varbinder/varbinder.h" #include "varbinder/ETSBinder.h" #include "lexer/lexer.h" diff --git a/ets2panda/parser/ETSparserNamespaces.cpp b/ets2panda/parser/ETSparserNamespaces.cpp index 5024059997..2824a4ab57 100644 --- a/ets2panda/parser/ETSparserNamespaces.cpp +++ b/ets2panda/parser/ETSparserNamespaces.cpp @@ -17,7 +17,7 @@ #include "lexer/lexer.h" #include "ir/astNode.h" #include "ir/ets/etsModule.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "util/errorRecovery.h" #include "generated/diagnostic.h" diff --git a/ets2panda/parser/ETSparserStatements.cpp b/ets2panda/parser/ETSparserStatements.cpp index 3a3bcf9294..2b5830cbdd 100644 --- a/ets2panda/parser/ETSparserStatements.cpp +++ b/ets2panda/parser/ETSparserStatements.cpp @@ -20,7 +20,7 @@ #include "parser/parserFlags.h" #include "util/errorRecovery.h" #include "util/helpers.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "varbinder/varbinder.h" #include "varbinder/ETSBinder.h" #include "lexer/lexer.h" diff --git a/ets2panda/parser/ETSparserTypes.cpp b/ets2panda/parser/ETSparserTypes.cpp index fde14c8669..817c470ac6 100644 --- a/ets2panda/parser/ETSparserTypes.cpp +++ b/ets2panda/parser/ETSparserTypes.cpp @@ -21,7 +21,7 @@ #include "parser/parserStatusContext.h" #include "util/helpers.h" #include "util/language.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "varbinder/varbinder.h" #include "varbinder/ETSBinder.h" #include "lexer/lexer.h" diff --git a/ets2panda/parser/context/classPrivateContext.h b/ets2panda/parser/context/classPrivateContext.h index 8533f4633b..64e2834c44 100644 --- a/ets2panda/parser/context/classPrivateContext.h +++ b/ets2panda/parser/context/classPrivateContext.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_CONTEXT_CLASS_PRIVATE_CONTEXT_H #define ES2PANDA_PARSER_CONTEXT_CLASS_PRIVATE_CONTEXT_H -#include +#include <../libarkbase/macros.h> #include "util/enumbitops.h" #include "util/ustring.h" diff --git a/ets2panda/parser/program/entityNameVisitor.h b/ets2panda/parser/program/entityNameVisitor.h index e8f64ffc46..70528292a3 100644 --- a/ets2panda/parser/program/entityNameVisitor.h +++ b/ets2panda/parser/program/entityNameVisitor.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_PROGRAM_ENTITY_NAME_VISITOR_H #define ES2PANDA_PARSER_PROGRAM_ENTITY_NAME_VISITOR_H -#include "libpandabase/mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "util/es2pandaMacros.h" #include "ir/visitor/IterateAstVisitor.h" #include "util/ustring.h" diff --git a/ets2panda/parser/program/program.cpp b/ets2panda/parser/program/program.cpp index 572ce976dc..39cf0da592 100644 --- a/ets2panda/parser/program/program.cpp +++ b/ets2panda/parser/program/program.cpp @@ -14,7 +14,7 @@ */ #include "program.h" -#include "macros.h" +#include "../libarkbase/macros.h" #include "public/public.h" #include "compiler/core/CFG.h" diff --git a/ets2panda/parser/program/program.h b/ets2panda/parser/program/program.h index c29543942c..1da6f176e4 100644 --- a/ets2panda/parser/program/program.h +++ b/ets2panda/parser/program/program.h @@ -17,8 +17,8 @@ #define ES2PANDA_PARSER_INCLUDE_PROGRAM_H #include "util/es2pandaMacros.h" -#include "mem/pool_manager.h" -#include "os/filesystem.h" +#include "../libarkbase/mem/pool_manager.h" +#include "../libarkbase/os/filesystem.h" #include "util/ustring.h" #include "util/path.h" #include "util/importPathManager.h" diff --git a/ets2panda/public/public.h b/ets2panda/public/public.h index 8ae7475ff7..e3dd61267e 100644 --- a/ets2panda/public/public.h +++ b/ets2panda/public/public.h @@ -20,7 +20,7 @@ #include "public/es2panda_lib.h" #include "assembler/assembly-program.h" -#include "libpandabase/mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "compiler/core/compileQueue.h" #include "parser/ETSparser.h" diff --git a/ets2panda/test/depanalyzer/path_getter.h.erb b/ets2panda/test/depanalyzer/path_getter.h.erb index 245be2c3a9..97aeddeccc 100644 --- a/ets2panda/test/depanalyzer/path_getter.h.erb +++ b/ets2panda/test/depanalyzer/path_getter.h.erb @@ -16,7 +16,7 @@ #ifndef PANDA_PATH_GETTER #define PANDA_PATH_GETTER -#include "macros.h" +#include "../libarkbase/macros.h" #include "util/path.h" #include diff --git a/ets2panda/test/depanalyzer/test.cpp b/ets2panda/test/depanalyzer/test.cpp index e3bfa34aac..156129d282 100644 --- a/ets2panda/test/depanalyzer/test.cpp +++ b/ets2panda/test/depanalyzer/test.cpp @@ -17,9 +17,9 @@ #include #include "driver/dependency_analyzer/dep_analyzer.h" -#include "macros.h" +#include "../libarkbase/macros.h" #include "path_getter.h" -#include "os/filesystem.h" +#include "../libarkbase/os/filesystem.h" namespace { diff --git a/ets2panda/test/unit/annotations/annotations_emit_test.h b/ets2panda/test/unit/annotations/annotations_emit_test.h index 5b1ea0f04a..4579b8d7c1 100644 --- a/ets2panda/test/unit/annotations/annotations_emit_test.h +++ b/ets2panda/test/unit/annotations/annotations_emit_test.h @@ -18,7 +18,7 @@ #include #include "annotation.h" -#include "macros.h" +#include "../libarkbase/macros.h" #include "util/options.h" #include #include diff --git a/ets2panda/test/unit/ast_dumper_test.cpp b/ets2panda/test/unit/ast_dumper_test.cpp index f7e5900061..38d2c0629d 100644 --- a/ets2panda/test/unit/ast_dumper_test.cpp +++ b/ets2panda/test/unit/ast_dumper_test.cpp @@ -15,19 +15,19 @@ #include #include -#include "macros.h" +#include "../libarkbase/macros.h" #include "assembler/assembly-program.h" #include "ir/astDump.h" #include "ir/expressions/literals/stringLiteral.h" #include "bytecode_optimizer/bytecodeopt_options.h" #include "compiler/compiler_logger.h" -#include "mem/arena_allocator.h" -#include "mem/pool_manager.h" +#include "../libarkbase/mem/arena_allocator.h" +#include "../libarkbase/mem/pool_manager.h" #include "es2panda.h" #include "util/arktsconfig.h" #include "util/generateBin.h" -#include "libpandabase/mem/mem.h" +#include "../libarkbase/mem/mem.h" #include "test/utils/panda_executable_path_getter.h" #include "test/utils/asm_test.h" diff --git a/ets2panda/test/unit/checker_test.cpp b/ets2panda/test/unit/checker_test.cpp index ba6e08165e..47a2f74e9a 100644 --- a/ets2panda/test/unit/checker_test.cpp +++ b/ets2panda/test/unit/checker_test.cpp @@ -14,7 +14,7 @@ */ #include -#include "macros.h" +#include "../libarkbase/macros.h" #include "test/utils/ast_verifier_test.h" using CheckerTest = test::utils::AstVerifierTest; diff --git a/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h b/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h index c5310786f9..29b188f1f0 100644 --- a/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h +++ b/ets2panda/test/unit/ets_specific_optimizer/ets_opt.h @@ -30,10 +30,10 @@ #include "compiler/optimizer/ir/inst.h" #include "compiler/optimizer/ir/ir_constructor.h" #include "compiler/optimizer/optimizations/regalloc/reg_alloc_linear_scan.h" -#include "libpandabase/utils/logger.h" -#include "libpandabase/utils/utils.h" -#include "mem/arena_allocator.h" -#include "mem/pool_manager.h" +#include "../libarkbase/utils/logger.h" +#include "../libarkbase/utils/utils.h" +#include "../libarkbase/mem/arena_allocator.h" +#include "../libarkbase/mem/pool_manager.h" #include "optimizer/ir/inst.h" #include "bytecode_optimizer/reg_acc_alloc.h" #include "bytecode_optimizer/optimize_bytecode.h" diff --git a/ets2panda/test/unit/extern_flag_test.cpp b/ets2panda/test/unit/extern_flag_test.cpp index 85b3fd21ad..c13f49c306 100644 --- a/ets2panda/test/unit/extern_flag_test.cpp +++ b/ets2panda/test/unit/extern_flag_test.cpp @@ -17,9 +17,9 @@ #include "assembler/assembly-program.h" #include "generated/signatures.h" -#include "libpandabase/mem/mem.h" -#include "macros.h" -#include "mem/pool_manager.h" +#include "../libarkbase/mem/mem.h" +#include "../libarkbase/macros.h" +#include "../libarkbase/mem/pool_manager.h" #include "util/options.h" #include "test/utils/asm_test.h" diff --git a/ets2panda/test/unit/globalETSObjectType_test.cpp b/ets2panda/test/unit/globalETSObjectType_test.cpp index 9100fabbe5..eea8b6f10b 100644 --- a/ets2panda/test/unit/globalETSObjectType_test.cpp +++ b/ets2panda/test/unit/globalETSObjectType_test.cpp @@ -23,8 +23,8 @@ #include "compiler/core/regSpiller.h" #include "compiler/lowering/phase.h" #include "es2panda.h" -#include "mem/arena_allocator.h" -#include "mem/pool_manager.h" +#include "../libarkbase/mem/arena_allocator.h" +#include "../libarkbase/mem/pool_manager.h" #include "public/public.h" #include "util/arktsconfig.h" #include "util/generateBin.h" diff --git a/ets2panda/test/unit/lowerings/scopes_initialization.cpp b/ets2panda/test/unit/lowerings/scopes_initialization.cpp index 1c82aeed87..6e9cd34e30 100644 --- a/ets2panda/test/unit/lowerings/scopes_initialization.cpp +++ b/ets2panda/test/unit/lowerings/scopes_initialization.cpp @@ -15,7 +15,7 @@ #include #include -#include "macros.h" +#include "../libarkbase/macros.h" #include "test/utils/node_creator.h" #include "test/utils/scope_init_test.h" diff --git a/ets2panda/test/unit/lsp/create_type_help_items_test.cpp b/ets2panda/test/unit/lsp/create_type_help_items_test.cpp index e27206f69b..12a4da836d 100644 --- a/ets2panda/test/unit/lsp/create_type_help_items_test.cpp +++ b/ets2panda/test/unit/lsp/create_type_help_items_test.cpp @@ -22,7 +22,7 @@ #include "ir/astNode.h" #include "lsp/include/internal_api.h" #include "public/es2panda_lib.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" namespace { diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state.cpp index b700c046a9..f3510811c9 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state.cpp @@ -17,7 +17,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_call_lambda.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_call_lambda.cpp index 1b04bf6538..e942a52a2c 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_call_lambda.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_call_lambda.cpp @@ -18,7 +18,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_func.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_func.cpp index a9d86e8b6b..38c71cbd60 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_func.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_change_func.cpp @@ -18,7 +18,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp index bd890b99a6..5ed1fbae96 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp @@ -18,7 +18,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_checker_type.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_checker_type.cpp index c1b46d0075..305ab47155 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_checker_type.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_checker_type.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_annotation.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_annotation.cpp index 19cc7b5504..b6a1dc2992 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_annotation.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_annotation.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_import.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_import.cpp index d795325136..2864828a94 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_import.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_import.cpp @@ -18,11 +18,11 @@ #include #include #include -#include "macros.h" +#include "../libarkbase/macros.h" #include "util.h" #include "public/es2panda_lib.h" #include "ir/ets/etsImportDeclaration.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" // NOLINTBEGIN diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_interface_declaration.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_interface_declaration.cpp index 00b9274ebf..27dd439a46 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_interface_declaration.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_interface_declaration.cpp @@ -18,7 +18,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_dynamic_class_recheck.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_dynamic_class_recheck.cpp index 4355b52e64..b6a9ba320c 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_dynamic_class_recheck.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_dynamic_class_recheck.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_function_to_arrow.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_function_to_arrow.cpp index 9aafdf4077..ccb773bd8f 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_function_to_arrow.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_function_to_arrow.cpp @@ -20,7 +20,7 @@ #include #include "util.h" #include "public/es2panda_lib.h" -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" // NOLINTBEGIN diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor.cpp index 723da6707e..beb794d83f 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_member_expression.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_member_expression.cpp index 10774a84d5..0d1b326e6e 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_member_expression.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_member_expression.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expr.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expr.cpp index 9b426e52ad..bd8274f995 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expr.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expr.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression.cpp index 226ef77522..4c60bc4b3f 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_new_expression.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_new_expression.cpp index 9f20032bec..210db0c5ba 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_new_expression.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_new_expression.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_return_expression.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_return_expression.cpp index be702bee01..39f3fc2768 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_return_expression.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_return_expression.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_string_optimize.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_string_optimize.cpp index b75123ec5f..0bc33e5ba7 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_string_optimize.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_string_optimize.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_annotation_change.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_annotation_change.cpp index 31a2e3f7dd..6bd8d0179d 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_annotation_change.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_annotation_change.cpp @@ -17,7 +17,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_class_decl_annotation.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_class_decl_annotation.cpp index 721f71e54b..df633b5972 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_class_decl_annotation.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_class_decl_annotation.cpp @@ -19,7 +19,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_this_into_method.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_this_into_method.cpp index 5a0619ead0..e230879d7c 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_this_into_method.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_this_into_method.cpp @@ -20,7 +20,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_class.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_class.cpp index 5dccbe707c..5aa4210849 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_class.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_class.cpp @@ -21,7 +21,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements.cpp index 65437f6c97..dc551bbdc2 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements.cpp @@ -18,7 +18,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements_lambda.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements_lambda.cpp index eaae54580c..a45c6d8a14 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements_lambda.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_update_statements_lambda.cpp @@ -18,7 +18,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util.h" diff --git a/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp b/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp index 1bfb5a30ef..81a16b3b15 100644 --- a/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp +++ b/ets2panda/test/unit/plugin/use_plugin_to_test_export_table.cpp @@ -16,8 +16,8 @@ #include #include #include "file.h" -#include "macros.h" -#include "os/file.h" +#include "../libarkbase/macros.h" +#include "../libarkbase/os/file.h" #include "public/es2panda_lib.h" #include "util.h" #include "parser/program/program.h" diff --git a/ets2panda/test/unit/plugin/util.cpp b/ets2panda/test/unit/plugin/util.cpp index e5709c5b75..1fe7ba369d 100644 --- a/ets2panda/test/unit/plugin/util.cpp +++ b/ets2panda/test/unit/plugin/util.cpp @@ -19,7 +19,7 @@ #include #include #include -#include "macros.h" +#include "../libarkbase/macros.h" static es2panda_Impl *g_implPtr = nullptr; diff --git a/ets2panda/test/unit/plugin/util.h b/ets2panda/test/unit/plugin/util.h index 515f89b105..156e63da20 100644 --- a/ets2panda/test/unit/plugin/util.h +++ b/ets2panda/test/unit/plugin/util.h @@ -22,7 +22,7 @@ #include #include -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" diff --git a/ets2panda/test/unit/plugin_conversion_rule/plugin_conversion_rule_unit_test.h b/ets2panda/test/unit/plugin_conversion_rule/plugin_conversion_rule_unit_test.h index 117529501e..92455d3fcb 100644 --- a/ets2panda/test/unit/plugin_conversion_rule/plugin_conversion_rule_unit_test.h +++ b/ets2panda/test/unit/plugin_conversion_rule/plugin_conversion_rule_unit_test.h @@ -18,7 +18,7 @@ #include -#include "macros.h" +#include "../libarkbase/macros.h" #include "test/utils/plugin_conversion_rule_test.h" diff --git a/ets2panda/test/unit/public/ast_builder_test.cpp b/ets2panda/test/unit/public/ast_builder_test.cpp index 559f1ed6ff..dc60677dc6 100644 --- a/ets2panda/test/unit/public/ast_builder_test.cpp +++ b/ets2panda/test/unit/public/ast_builder_test.cpp @@ -14,7 +14,7 @@ */ #include "ast_verifier_test.h" -#include "macros.h" +#include "../libarkbase/macros.h" #include "util/ast-builders/classDefinitionBuilder.h" #include "util/ast-builders/binaryExpressionBuilder.h" #include "util/ast-builders/classPropertyBuilder.h" diff --git a/ets2panda/test/unit/public/ast_verifier_short_test.cpp b/ets2panda/test/unit/public/ast_verifier_short_test.cpp index 4a20d2a054..1b33b5f8ed 100644 --- a/ets2panda/test/unit/public/ast_verifier_short_test.cpp +++ b/ets2panda/test/unit/public/ast_verifier_short_test.cpp @@ -20,7 +20,7 @@ #include "ir/expressions/identifier.h" #include "ir/expressions/literals/numberLiteral.h" #include "ir/expressions/literals/booleanLiteral.h" -#include "macros.h" +#include "../libarkbase/macros.h" #include "varbinder/ETSBinder.h" #include "util/diagnosticEngine.h" diff --git a/ets2panda/test/unit/public/es2panda_public_test.cpp b/ets2panda/test/unit/public/es2panda_public_test.cpp index 8d1f457c6b..ab53dff88d 100644 --- a/ets2panda/test/unit/public/es2panda_public_test.cpp +++ b/ets2panda/test/unit/public/es2panda_public_test.cpp @@ -14,7 +14,7 @@ */ #include -#include "macros.h" +#include "../libarkbase/macros.h" #include "public/es2panda_lib.h" #include "test/utils/panda_executable_path_getter.h" #include "test/utils/ast_verifier_test.h" diff --git a/ets2panda/test/unit/rest_parameter_flag_test.cpp b/ets2panda/test/unit/rest_parameter_flag_test.cpp index 026166d78b..306c640a8f 100644 --- a/ets2panda/test/unit/rest_parameter_flag_test.cpp +++ b/ets2panda/test/unit/rest_parameter_flag_test.cpp @@ -18,9 +18,9 @@ #include "assembler/assembly-program.h" #include "es2panda.h" #include "generated/signatures.h" -#include "libpandabase/mem/mem.h" -#include "macros.h" -#include "mem/pool_manager.h" +#include "../libarkbase/mem/mem.h" +#include "../libarkbase/macros.h" +#include "../libarkbase/mem/pool_manager.h" #include "test/utils/asm_test.h" namespace ark::es2panda::compiler::test { diff --git a/ets2panda/test/unit/union_normalization_test_1.cpp b/ets2panda/test/unit/union_normalization_test_1.cpp index d4cbe2fb7d..f2e2a34ced 100644 --- a/ets2panda/test/unit/union_normalization_test_1.cpp +++ b/ets2panda/test/unit/union_normalization_test_1.cpp @@ -25,8 +25,8 @@ #include "compiler/core/regSpiller.h" #include "compiler/lowering/phase.h" #include "es2panda.h" -#include "mem/arena_allocator.h" -#include "mem/pool_manager.h" +#include "../libarkbase/mem/arena_allocator.h" +#include "../libarkbase/mem/pool_manager.h" #include "public/public.h" #include "util/arktsconfig.h" #include "util/generateBin.h" diff --git a/ets2panda/test/unit/union_normalization_test_2.cpp b/ets2panda/test/unit/union_normalization_test_2.cpp index 59715ca07e..90a3984eb3 100644 --- a/ets2panda/test/unit/union_normalization_test_2.cpp +++ b/ets2panda/test/unit/union_normalization_test_2.cpp @@ -25,8 +25,8 @@ #include "compiler/core/regSpiller.h" #include "compiler/lowering/phase.h" #include "es2panda.h" -#include "mem/arena_allocator.h" -#include "mem/pool_manager.h" +#include "../libarkbase/mem/arena_allocator.h" +#include "../libarkbase/mem/pool_manager.h" #include "public/public.h" #include "util/arktsconfig.h" #include "util/generateBin.h" diff --git a/ets2panda/test/utils/panda_executable_path_getter.cpp b/ets2panda/test/utils/panda_executable_path_getter.cpp index 1e7225caea..7574d7b2cc 100644 --- a/ets2panda/test/utils/panda_executable_path_getter.cpp +++ b/ets2panda/test/utils/panda_executable_path_getter.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "macros.h" +#include "../libarkbase/macros.h" #include "panda_executable_path_getter.h" namespace test::utils { diff --git a/ets2panda/test/utils/plugin_conversion_rule_test.h b/ets2panda/test/utils/plugin_conversion_rule_test.h index 22002c4ba8..64f88ef420 100644 --- a/ets2panda/test/utils/plugin_conversion_rule_test.h +++ b/ets2panda/test/utils/plugin_conversion_rule_test.h @@ -21,7 +21,7 @@ #include -#include "macros.h" +#include "../libarkbase/macros.h" namespace test::utils { diff --git a/ets2panda/test/utils/scope_init_test.h b/ets2panda/test/utils/scope_init_test.h index 2529a908f5..1a40ba396f 100644 --- a/ets2panda/test/utils/scope_init_test.h +++ b/ets2panda/test/utils/scope_init_test.h @@ -20,7 +20,7 @@ #include "ir/statements/blockStatement.h" #include "ir/statements/variableDeclarator.h" #include "ir/statements/variableDeclaration.h" -#include "mem/pool_manager.h" +#include "../libarkbase/mem/pool_manager.h" #include "compiler/lowering/phase.h" #include diff --git a/ets2panda/util/arktsconfig.cpp b/ets2panda/util/arktsconfig.cpp index d58d6220f2..0eb1adb5be 100644 --- a/ets2panda/util/arktsconfig.cpp +++ b/ets2panda/util/arktsconfig.cpp @@ -14,7 +14,7 @@ */ #include "arktsconfig.h" -#include "libpandabase/os/filesystem.h" +#include "../libarkbase/os/filesystem.h" #include "util/language.h" #include "util/diagnosticEngine.h" #include "generated/signatures.h" diff --git a/ets2panda/util/arktsconfig.h b/ets2panda/util/arktsconfig.h index fec474785a..7f7a4bd007 100644 --- a/ets2panda/util/arktsconfig.h +++ b/ets2panda/util/arktsconfig.h @@ -25,8 +25,8 @@ #include "util/language.h" #include "util/diagnostic.h" -#include "libpandabase/utils/json_builder.h" -#include "libpandabase/utils/json_parser.h" +#include "../libarkbase/utils/json_builder.h" +#include "../libarkbase/utils/json_parser.h" // NOTE(ivagin): If ARKTSCONFIG_USE_FILESYSTEM is not defined part of ArkTsConfig functionality is disabled. // Only build configuration which prevents us from usage of std::filesystem is "MOBILE" build diff --git a/ets2panda/util/ast-builders/arrowFunctionExpressionBuilder.h b/ets2panda/util/ast-builders/arrowFunctionExpressionBuilder.h index 16f2bbf171..acaf830fc3 100644 --- a/ets2panda/util/ast-builders/arrowFunctionExpressionBuilder.h +++ b/ets2panda/util/ast-builders/arrowFunctionExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_ARROW_FUNCTION_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_ARROW_FUNCTION_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/arrowFunctionExpression.h" diff --git a/ets2panda/util/ast-builders/assignmentExpressionBuilder.h b/ets2panda/util/ast-builders/assignmentExpressionBuilder.h index 127775618c..ecdf876fe9 100644 --- a/ets2panda/util/ast-builders/assignmentExpressionBuilder.h +++ b/ets2panda/util/ast-builders/assignmentExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_ASSIGNMENT_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_ASSIGNMENT_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/assignmentExpression.h" diff --git a/ets2panda/util/ast-builders/astBuilder.h b/ets2panda/util/ast-builders/astBuilder.h index b71842e601..54019ffeed 100644 --- a/ets2panda/util/ast-builders/astBuilder.h +++ b/ets2panda/util/ast-builders/astBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_AST_BUILDER #define ES2PANDA_UTIL_INCLUDE_AST_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "util/helpers.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/awaitExpressionBuilder.h b/ets2panda/util/ast-builders/awaitExpressionBuilder.h index 7bc7b51ede..c49b2f59d0 100644 --- a/ets2panda/util/ast-builders/awaitExpressionBuilder.h +++ b/ets2panda/util/ast-builders/awaitExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_AWAIT_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_AWAIT_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/awaitExpression.h" #include "ir/expressions/literals/numberLiteral.h" diff --git a/ets2panda/util/ast-builders/bigintLiteralBuilder.h b/ets2panda/util/ast-builders/bigintLiteralBuilder.h index cda60226f4..c5e1203942 100644 --- a/ets2panda/util/ast-builders/bigintLiteralBuilder.h +++ b/ets2panda/util/ast-builders/bigintLiteralBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_BIGINT_LITERAL_BUILDER #include "ir/expressions/literals/bigIntLiteral.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/binaryExpressionBuilder.h b/ets2panda/util/ast-builders/binaryExpressionBuilder.h index b25504387c..0553754306 100644 --- a/ets2panda/util/ast-builders/binaryExpressionBuilder.h +++ b/ets2panda/util/ast-builders/binaryExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_BINARY_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_BINARY_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/binaryExpression.h" #include "ir/expressions/literals/numberLiteral.h" diff --git a/ets2panda/util/ast-builders/blockExpressionBuilder.h b/ets2panda/util/ast-builders/blockExpressionBuilder.h index 30a46d57a8..46090f0060 100644 --- a/ets2panda/util/ast-builders/blockExpressionBuilder.h +++ b/ets2panda/util/ast-builders/blockExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_BLOCK_EXPRESSION_BUILDER #include "ir/expressions/blockExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/blockStatementBuilder.h b/ets2panda/util/ast-builders/blockStatementBuilder.h index f8a92cfc57..afec452b9b 100644 --- a/ets2panda/util/ast-builders/blockStatementBuilder.h +++ b/ets2panda/util/ast-builders/blockStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_BLOCK_STATEMENT_BUILDER #include "ir/statements/blockStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/booleanLiteralBuilder.h b/ets2panda/util/ast-builders/booleanLiteralBuilder.h index abbfdb0b25..78378ae60c 100644 --- a/ets2panda/util/ast-builders/booleanLiteralBuilder.h +++ b/ets2panda/util/ast-builders/booleanLiteralBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_BOOLEAN_LITERAL_BUILDER #include "ir/expressions/literals/booleanLiteral.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/breakStatementBuilder.h b/ets2panda/util/ast-builders/breakStatementBuilder.h index e6adb26964..abbf4781d9 100644 --- a/ets2panda/util/ast-builders/breakStatementBuilder.h +++ b/ets2panda/util/ast-builders/breakStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_BREAK_STATEMENT_BUILDER #include "ir/statements/breakStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/callExpressionBuilder.h b/ets2panda/util/ast-builders/callExpressionBuilder.h index 6f8fe5d839..fb2cc28766 100644 --- a/ets2panda/util/ast-builders/callExpressionBuilder.h +++ b/ets2panda/util/ast-builders/callExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_CALL_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_CALL_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/callExpression.h" diff --git a/ets2panda/util/ast-builders/catchClauseBuilder.h b/ets2panda/util/ast-builders/catchClauseBuilder.h index 96f7c38909..2ad03707db 100644 --- a/ets2panda/util/ast-builders/catchClauseBuilder.h +++ b/ets2panda/util/ast-builders/catchClauseBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_CATCH_CLAUSE_BUILDER #define ES2PANDA_UTIL_INCLUDE_CATCH_CLAUSE_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/base/catchClause.h" diff --git a/ets2panda/util/ast-builders/chainExpressionBuilder.h b/ets2panda/util/ast-builders/chainExpressionBuilder.h index 65bf0b8648..57383d7c88 100644 --- a/ets2panda/util/ast-builders/chainExpressionBuilder.h +++ b/ets2panda/util/ast-builders/chainExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_CHAIN_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_CHAIN_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/chainExpression.h" diff --git a/ets2panda/util/ast-builders/charLiteralBuilder.h b/ets2panda/util/ast-builders/charLiteralBuilder.h index 701ede6cf5..2e3845e795 100644 --- a/ets2panda/util/ast-builders/charLiteralBuilder.h +++ b/ets2panda/util/ast-builders/charLiteralBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_CHAR_LITERAL_BUILDER #include "ir/expressions/literals/charLiteral.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/classDeclarationBuilder.h b/ets2panda/util/ast-builders/classDeclarationBuilder.h index 6335bd0b9b..1c157a3d7a 100644 --- a/ets2panda/util/ast-builders/classDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/classDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_CLASS_DECLARATION_BUILDER #include "ir/statements/classDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/classDefinitionBuilder.h b/ets2panda/util/ast-builders/classDefinitionBuilder.h index 02b3083bf8..0baac7f271 100644 --- a/ets2panda/util/ast-builders/classDefinitionBuilder.h +++ b/ets2panda/util/ast-builders/classDefinitionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_CLASS_DEFINITION_BUILDER #include "ir/base/classDefinition.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/classExpressionBuilder.h b/ets2panda/util/ast-builders/classExpressionBuilder.h index 09090d4d6a..c278e1e118 100644 --- a/ets2panda/util/ast-builders/classExpressionBuilder.h +++ b/ets2panda/util/ast-builders/classExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_CLASS_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_CLASS_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/classExpression.h" diff --git a/ets2panda/util/ast-builders/classPropertyBuilder.h b/ets2panda/util/ast-builders/classPropertyBuilder.h index 6821f94342..9bd8e95a25 100644 --- a/ets2panda/util/ast-builders/classPropertyBuilder.h +++ b/ets2panda/util/ast-builders/classPropertyBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_CLASS_PROPERTY_BUILDER #define ES2PANDA_UTIL_INCLUDE_CLASS_PROPERTY_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/base/classProperty.h" diff --git a/ets2panda/util/ast-builders/classStaticBlockBuilder.h b/ets2panda/util/ast-builders/classStaticBlockBuilder.h index f4cca23ec3..2aced92944 100644 --- a/ets2panda/util/ast-builders/classStaticBlockBuilder.h +++ b/ets2panda/util/ast-builders/classStaticBlockBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_CLASS_STATIC_BLOCK_BUILDER #define ES2PANDA_UTIL_INCLUDE_CLASS_STATIC_BLOCK_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/base/classStaticBlock.h" diff --git a/ets2panda/util/ast-builders/conditionalExpressionBuilder.h b/ets2panda/util/ast-builders/conditionalExpressionBuilder.h index 01153ee58c..59a1ffc799 100644 --- a/ets2panda/util/ast-builders/conditionalExpressionBuilder.h +++ b/ets2panda/util/ast-builders/conditionalExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_CONDITIONAL_EXPRESSION_BUILDER #include "ir/expressions/conditionalExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/continueStatementBuilder.h b/ets2panda/util/ast-builders/continueStatementBuilder.h index 5fcaf8e292..a231243ee2 100644 --- a/ets2panda/util/ast-builders/continueStatementBuilder.h +++ b/ets2panda/util/ast-builders/continueStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_CONTINUE_STATEMENT_BUILDER #include "ir/statements/continueStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/debuggerStatementBuilder.h b/ets2panda/util/ast-builders/debuggerStatementBuilder.h index d370755314..7a6576f154 100644 --- a/ets2panda/util/ast-builders/debuggerStatementBuilder.h +++ b/ets2panda/util/ast-builders/debuggerStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_DEBUGGER_STATEMENT_BUILDER #include "ir/statements/debuggerStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/decoratorBuilder.h b/ets2panda/util/ast-builders/decoratorBuilder.h index 5bdacf4afc..3108da5cd5 100644 --- a/ets2panda/util/ast-builders/decoratorBuilder.h +++ b/ets2panda/util/ast-builders/decoratorBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_DECORATOR_BUILDER #include "ir/base/decorator.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/directEvalExpressionBuilder.h b/ets2panda/util/ast-builders/directEvalExpressionBuilder.h index 9a62bb515d..3300b6f1a3 100644 --- a/ets2panda/util/ast-builders/directEvalExpressionBuilder.h +++ b/ets2panda/util/ast-builders/directEvalExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_DIRECT_EVAL_EXPRESSION_BUILDER #include "ir/expressions/directEvalExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/doWhileStatementBuilder.h b/ets2panda/util/ast-builders/doWhileStatementBuilder.h index 19af2656cd..10ddf7d2b3 100644 --- a/ets2panda/util/ast-builders/doWhileStatementBuilder.h +++ b/ets2panda/util/ast-builders/doWhileStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_DO_WHILE_STATEMENT_BUILDER #include "ir/statements/doWhileStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/emptyStatementBuilder.h b/ets2panda/util/ast-builders/emptyStatementBuilder.h index 769669cce7..29f4881b1c 100644 --- a/ets2panda/util/ast-builders/emptyStatementBuilder.h +++ b/ets2panda/util/ast-builders/emptyStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_EMPTY_STATEMENT_BUILDER #include "ir/statements/emptyStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsClassLiteralBuilder.h b/ets2panda/util/ast-builders/etsClassLiteralBuilder.h index 79bd94b88e..049083972a 100644 --- a/ets2panda/util/ast-builders/etsClassLiteralBuilder.h +++ b/ets2panda/util/ast-builders/etsClassLiteralBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_CLASS_LITERAL_BUILDER #include "ir/ets/etsClassLiteral.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsFunctionTypeBuilder.h b/ets2panda/util/ast-builders/etsFunctionTypeBuilder.h index bebd8ba0a1..beb837cff2 100644 --- a/ets2panda/util/ast-builders/etsFunctionTypeBuilder.h +++ b/ets2panda/util/ast-builders/etsFunctionTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_FUNCTION_TYPE_BUILDER #include "ir/ets/etsFunctionType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsNewArrayInstanceExpressionBuilder.h b/ets2panda/util/ast-builders/etsNewArrayInstanceExpressionBuilder.h index 49734c6374..e30481ba26 100644 --- a/ets2panda/util/ast-builders/etsNewArrayInstanceExpressionBuilder.h +++ b/ets2panda/util/ast-builders/etsNewArrayInstanceExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_NEW_ARRAY_INSTANCE_EXPRESSION_BUILDER #include "ir/ets/etsNewArrayInstanceExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsNewClassInstanceExpressionBuilder.h b/ets2panda/util/ast-builders/etsNewClassInstanceExpressionBuilder.h index 523b754e88..61a7169d0c 100644 --- a/ets2panda/util/ast-builders/etsNewClassInstanceExpressionBuilder.h +++ b/ets2panda/util/ast-builders/etsNewClassInstanceExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_NEW_CLASS_INSTANCE_EXPRESSION_BUILDER #include "ir/ets/etsNewClassInstanceExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsNewMultiDivArrayInstanceExpressionBuilder.h b/ets2panda/util/ast-builders/etsNewMultiDivArrayInstanceExpressionBuilder.h index 77e3bd5171..fd6479ce5c 100644 --- a/ets2panda/util/ast-builders/etsNewMultiDivArrayInstanceExpressionBuilder.h +++ b/ets2panda/util/ast-builders/etsNewMultiDivArrayInstanceExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_NEW_MULTI_DIV_ARRAY_INSTANCE_EXPRESSION_BUILDER #include "ir/ets/etsNewMultiDimArrayInstanceExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsNullTypeBuilder.h b/ets2panda/util/ast-builders/etsNullTypeBuilder.h index 2beb7de8e1..ebe26f3115 100644 --- a/ets2panda/util/ast-builders/etsNullTypeBuilder.h +++ b/ets2panda/util/ast-builders/etsNullTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_NULL_TYPE_BUILDER #include "ir/ets/etsNullishTypes.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsPackageDeclarationBuilder.h b/ets2panda/util/ast-builders/etsPackageDeclarationBuilder.h index b80f6b7bc2..397e82afe6 100644 --- a/ets2panda/util/ast-builders/etsPackageDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/etsPackageDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_PACKAGE_DECLARATION_BUILDER #include "ir/ets/etsPackageDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsParameterExpressionBuilder.h b/ets2panda/util/ast-builders/etsParameterExpressionBuilder.h index 4a5de5fce2..0a217d9b99 100644 --- a/ets2panda/util/ast-builders/etsParameterExpressionBuilder.h +++ b/ets2panda/util/ast-builders/etsParameterExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_PARAMETER_EXPRESSION_BUILDER #include "ir/ets/etsParameterExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsPrimitiveTypeBuilder.h b/ets2panda/util/ast-builders/etsPrimitiveTypeBuilder.h index e7b902d462..cda0024f05 100644 --- a/ets2panda/util/ast-builders/etsPrimitiveTypeBuilder.h +++ b/ets2panda/util/ast-builders/etsPrimitiveTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_PRIMITIVE_TYPE_BUILDER #include "ir/ets/etsPrimitiveType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsReExportDeclarationBuilder.h b/ets2panda/util/ast-builders/etsReExportDeclarationBuilder.h index 82f4fd380f..d2a2d51d83 100644 --- a/ets2panda/util/ast-builders/etsReExportDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/etsReExportDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_RE_EXPORT_DECLARATION_BUILDER #include "ir/ets/etsReExportDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsStructDeclarationBuilder.h b/ets2panda/util/ast-builders/etsStructDeclarationBuilder.h index e104a4603c..496eaa95e2 100644 --- a/ets2panda/util/ast-builders/etsStructDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/etsStructDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_STRUCT_DECLARATION_BUILDER #include "ir/ets/etsStructDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsTupleBuilder.h b/ets2panda/util/ast-builders/etsTupleBuilder.h index 043711183e..071f4662c2 100644 --- a/ets2panda/util/ast-builders/etsTupleBuilder.h +++ b/ets2panda/util/ast-builders/etsTupleBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_TUPLE_BUILDER #include "ir/ets/etsTuple.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsTypeReferenceBuilder.h b/ets2panda/util/ast-builders/etsTypeReferenceBuilder.h index 643e73e753..981f5923ca 100644 --- a/ets2panda/util/ast-builders/etsTypeReferenceBuilder.h +++ b/ets2panda/util/ast-builders/etsTypeReferenceBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_TYPE_REFERENCE_BUILDER #include "ir/ets/etsTypeReference.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsTypeReferencePartBuilder.h b/ets2panda/util/ast-builders/etsTypeReferencePartBuilder.h index ae3d5470bc..f05c401c15 100644 --- a/ets2panda/util/ast-builders/etsTypeReferencePartBuilder.h +++ b/ets2panda/util/ast-builders/etsTypeReferencePartBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_TYPE_REFERENCE_PART_BUILDER #include "ir/ets/etsTypeReferencePart.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsUndefinedTypeBuilder.h b/ets2panda/util/ast-builders/etsUndefinedTypeBuilder.h index b265866d1b..d2e652b35c 100644 --- a/ets2panda/util/ast-builders/etsUndefinedTypeBuilder.h +++ b/ets2panda/util/ast-builders/etsUndefinedTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_UNDEFINED_BUILDER #include "ir/ets/etsNullishTypes.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsUnionTypeBuilder.h b/ets2panda/util/ast-builders/etsUnionTypeBuilder.h index 0ad352f061..c0ea976ae7 100644 --- a/ets2panda/util/ast-builders/etsUnionTypeBuilder.h +++ b/ets2panda/util/ast-builders/etsUnionTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_UNION_TYPE_BUILDER #include "ir/ets/etsUnionType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/etsWildcardTypeBuilder.h b/ets2panda/util/ast-builders/etsWildcardTypeBuilder.h index d53c53f01c..f59d77ee6b 100644 --- a/ets2panda/util/ast-builders/etsWildcardTypeBuilder.h +++ b/ets2panda/util/ast-builders/etsWildcardTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_ETS_WILDCARD_TYPE_BUILDER #include "ir/ets/etsWildcardType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/exportAllDeclarationBuilder.h b/ets2panda/util/ast-builders/exportAllDeclarationBuilder.h index 20cd5b17b4..4b6b11fce0 100644 --- a/ets2panda/util/ast-builders/exportAllDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/exportAllDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_EXPORT_ALL_DECLARATION_BUILDER #include "ir/module/exportAllDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/exportDefaultDeclarationBuilder.h b/ets2panda/util/ast-builders/exportDefaultDeclarationBuilder.h index 30ab2b40a5..8bed2b11a4 100644 --- a/ets2panda/util/ast-builders/exportDefaultDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/exportDefaultDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_EXPORT_DEFAULT_DECLARATION_BUILDER #include "ir/module/exportDefaultDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/exportNamedDeclarationBuilder.h b/ets2panda/util/ast-builders/exportNamedDeclarationBuilder.h index c909bb3d63..6e8b74404d 100644 --- a/ets2panda/util/ast-builders/exportNamedDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/exportNamedDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_EXPORT_NAMED_DECLARATION_BUILDER #include "ir/module/exportNamedDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/exportSpecifierBuilder.h b/ets2panda/util/ast-builders/exportSpecifierBuilder.h index b3487fb71f..d5eb5fd7fc 100644 --- a/ets2panda/util/ast-builders/exportSpecifierBuilder.h +++ b/ets2panda/util/ast-builders/exportSpecifierBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_EXPORT_SPECIFIER_BUILDER #include "ir/module/exportSpecifier.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/expressionStatementBuilder.h b/ets2panda/util/ast-builders/expressionStatementBuilder.h index 4dcabc44f8..dd1cc57a78 100644 --- a/ets2panda/util/ast-builders/expressionStatementBuilder.h +++ b/ets2panda/util/ast-builders/expressionStatementBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_EXPRESSION_STATEMENT_BUILDER #define ES2PANDA_UTIL_INCLUDE_EXPRESSION_STATEMENT_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/statements/expressionStatement.h" diff --git a/ets2panda/util/ast-builders/forInStatementBuilder.h b/ets2panda/util/ast-builders/forInStatementBuilder.h index 9680930cd8..a50931ac0a 100644 --- a/ets2panda/util/ast-builders/forInStatementBuilder.h +++ b/ets2panda/util/ast-builders/forInStatementBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_FOR_IN_STATEMENT_BUILDER #define ES2PANDA_UTIL_INCLUDE_FOR_IN_STATEMENT_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/statements/forInStatement.h" diff --git a/ets2panda/util/ast-builders/forOfStatementBuilder.h b/ets2panda/util/ast-builders/forOfStatementBuilder.h index ebd02020c6..9cf051c218 100644 --- a/ets2panda/util/ast-builders/forOfStatementBuilder.h +++ b/ets2panda/util/ast-builders/forOfStatementBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_FOR_OF_STATEMENT_BUILDER #define ES2PANDA_UTIL_INCLUDE_FOR_OF_STATEMENT_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/statements/forOfStatement.h" diff --git a/ets2panda/util/ast-builders/forUpdateStatementBuilder.h b/ets2panda/util/ast-builders/forUpdateStatementBuilder.h index 5f93a01043..ef44afcf21 100644 --- a/ets2panda/util/ast-builders/forUpdateStatementBuilder.h +++ b/ets2panda/util/ast-builders/forUpdateStatementBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_FOR_UPDATE_STATEMENT_BUILDER #define ES2PANDA_UTIL_INCLUDE_FOR_UPDATE_STATEMENT_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/statements/forUpdateStatement.h" diff --git a/ets2panda/util/ast-builders/functionDeclarationBuilder.h b/ets2panda/util/ast-builders/functionDeclarationBuilder.h index 941dfaec87..1ad9beeaa0 100644 --- a/ets2panda/util/ast-builders/functionDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/functionDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_FUNCTION_DECLARATION_BUILDER #include "ir/statements/functionDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/functionExpressionBuilder.h b/ets2panda/util/ast-builders/functionExpressionBuilder.h index 4730f27125..a19d442388 100644 --- a/ets2panda/util/ast-builders/functionExpressionBuilder.h +++ b/ets2panda/util/ast-builders/functionExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_FUNCTION_EXPRESSION_BUILDER #include "ir/expressions/functionExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/identifierBuilder.h b/ets2panda/util/ast-builders/identifierBuilder.h index 6cac63d8e2..419339651b 100644 --- a/ets2panda/util/ast-builders/identifierBuilder.h +++ b/ets2panda/util/ast-builders/identifierBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_IDENTIFIER_BUILDER #define ES2PANDA_UTIL_INCLUDE_IDENTIFIER_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/identifier.h" diff --git a/ets2panda/util/ast-builders/ifStatementBuilder.h b/ets2panda/util/ast-builders/ifStatementBuilder.h index 66936b1870..b583e81913 100644 --- a/ets2panda/util/ast-builders/ifStatementBuilder.h +++ b/ets2panda/util/ast-builders/ifStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_IF_STATEMENT_BUILDER #include "ir/statements/ifStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/importDeclarationBuilder.h b/ets2panda/util/ast-builders/importDeclarationBuilder.h index 7dfe51e8c5..cd7fdd55e9 100644 --- a/ets2panda/util/ast-builders/importDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/importDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_IMPORT_DECLARATION_BUILDER #include "ir/module/importDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/importDefaultSpecifierBuilder.h b/ets2panda/util/ast-builders/importDefaultSpecifierBuilder.h index 1788b824a6..2f9f3db344 100644 --- a/ets2panda/util/ast-builders/importDefaultSpecifierBuilder.h +++ b/ets2panda/util/ast-builders/importDefaultSpecifierBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_IMPORT_NAMESPACESPECIFIER_BUILDER #include "ir/module/importDefaultSpecifier.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/importExpressionBuilder.h b/ets2panda/util/ast-builders/importExpressionBuilder.h index 2b99bfd5ae..3815d06ba3 100644 --- a/ets2panda/util/ast-builders/importExpressionBuilder.h +++ b/ets2panda/util/ast-builders/importExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_IMPORT_EXPRESSION_BUILDER #include "ir/expressions/importExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/importNamespaceSpecifierBuilder.h b/ets2panda/util/ast-builders/importNamespaceSpecifierBuilder.h index fc2cb687e4..8fafbbcc84 100644 --- a/ets2panda/util/ast-builders/importNamespaceSpecifierBuilder.h +++ b/ets2panda/util/ast-builders/importNamespaceSpecifierBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_IMPORT_NAMESPACE_SPECIFIER_BUILDER #include "ir/module/importNamespaceSpecifier.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/importSpecifierBuilder.h b/ets2panda/util/ast-builders/importSpecifierBuilder.h index 1daf07d53f..f8b2ed6241 100644 --- a/ets2panda/util/ast-builders/importSpecifierBuilder.h +++ b/ets2panda/util/ast-builders/importSpecifierBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_IMPORT_SPECIFIER_BUILDER #include "ir/module/importSpecifier.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/labelledStatementBuilder.h b/ets2panda/util/ast-builders/labelledStatementBuilder.h index e8f543bb13..faeebfa5f8 100644 --- a/ets2panda/util/ast-builders/labelledStatementBuilder.h +++ b/ets2panda/util/ast-builders/labelledStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_LABELLED_STATEMENT_BUILDER #include "ir/statements/labelledStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/memberExpressionBuilder.h b/ets2panda/util/ast-builders/memberExpressionBuilder.h index bf1d1632fd..ed35e90c66 100644 --- a/ets2panda/util/ast-builders/memberExpressionBuilder.h +++ b/ets2panda/util/ast-builders/memberExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_MEMBER_EXPRESSION_BUILDER #include "ir/expressions/memberExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/metaPropertyBuilder.h b/ets2panda/util/ast-builders/metaPropertyBuilder.h index 66f9dbbb6d..e19da46c12 100644 --- a/ets2panda/util/ast-builders/metaPropertyBuilder.h +++ b/ets2panda/util/ast-builders/metaPropertyBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_META_PROPERTY_BUILDER #include "ir/base/metaProperty.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/methodDefinitionBuilder.h b/ets2panda/util/ast-builders/methodDefinitionBuilder.h index 4230b3af72..8bfbc4f04e 100644 --- a/ets2panda/util/ast-builders/methodDefinitionBuilder.h +++ b/ets2panda/util/ast-builders/methodDefinitionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_METHOD_DEFINITION_BUILDER #define ES2PANDA_UTIL_INCLUDE_METHOD_DEFINITION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/base/methodDefinition.h" diff --git a/ets2panda/util/ast-builders/namedTypeBuilder.h b/ets2panda/util/ast-builders/namedTypeBuilder.h index 0adbd80768..ce0908ae23 100644 --- a/ets2panda/util/ast-builders/namedTypeBuilder.h +++ b/ets2panda/util/ast-builders/namedTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_NAMED_TYPE_BUILDER #include "ir/as/namedType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/newExpressionBuilder.h b/ets2panda/util/ast-builders/newExpressionBuilder.h index 4f498f96d5..a91c2de9f5 100644 --- a/ets2panda/util/ast-builders/newExpressionBuilder.h +++ b/ets2panda/util/ast-builders/newExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_NEW_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_NEW_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/newExpression.h" diff --git a/ets2panda/util/ast-builders/nullLiteralBuilder.h b/ets2panda/util/ast-builders/nullLiteralBuilder.h index dc558906d2..5e2e9b7690 100644 --- a/ets2panda/util/ast-builders/nullLiteralBuilder.h +++ b/ets2panda/util/ast-builders/nullLiteralBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_NULL_LITERAL_BUILDER #include "ir/expressions/literals/nullLiteral.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/numberLiteralBuilder.h b/ets2panda/util/ast-builders/numberLiteralBuilder.h index 5d1f73a104..b3254408be 100644 --- a/ets2panda/util/ast-builders/numberLiteralBuilder.h +++ b/ets2panda/util/ast-builders/numberLiteralBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_NUMBER_LITERAL_BUILDER #define ES2PANDA_UTIL_INCLUDE_NUMBER_LITERAL_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/literals/numberLiteral.h" diff --git a/ets2panda/util/ast-builders/omittedExpressionBuilder.h b/ets2panda/util/ast-builders/omittedExpressionBuilder.h index afcfd8ddab..34fc5cc72a 100644 --- a/ets2panda/util/ast-builders/omittedExpressionBuilder.h +++ b/ets2panda/util/ast-builders/omittedExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_OMITTED_EXPRESSION_BUILDER #include "ir/expressions/omittedExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/opaqueTypeNodeBuilder.h b/ets2panda/util/ast-builders/opaqueTypeNodeBuilder.h index b87bbcf5f9..dde7687244 100644 --- a/ets2panda/util/ast-builders/opaqueTypeNodeBuilder.h +++ b/ets2panda/util/ast-builders/opaqueTypeNodeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_OPAQUE_TYPE_NODE_BUILDER #include "ir/opaqueTypeNode.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/prefixAssertionExpressionBuilder.h b/ets2panda/util/ast-builders/prefixAssertionExpressionBuilder.h index 0d7b3088af..3df9fb7b65 100644 --- a/ets2panda/util/ast-builders/prefixAssertionExpressionBuilder.h +++ b/ets2panda/util/ast-builders/prefixAssertionExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_PREFIX_ASSERTION_EXPRESSION_BUILDER #include "ir/as/prefixAssertionExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/propertyBuilder.h b/ets2panda/util/ast-builders/propertyBuilder.h index 7286152dc6..257e53b4f4 100644 --- a/ets2panda/util/ast-builders/propertyBuilder.h +++ b/ets2panda/util/ast-builders/propertyBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_PROPERTY_BUILDER #include "ir/base/property.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/regExpLiteralBuilder.h b/ets2panda/util/ast-builders/regExpLiteralBuilder.h index b8acaa1d86..6737b852f3 100644 --- a/ets2panda/util/ast-builders/regExpLiteralBuilder.h +++ b/ets2panda/util/ast-builders/regExpLiteralBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_REG_EXP_LITERAL_BUILDER #define ES2PANDA_UTIL_INCLUDE_REG_EXP_LITERAL_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/literals/regExpLiteral.h" diff --git a/ets2panda/util/ast-builders/returnStatementBuilder.h b/ets2panda/util/ast-builders/returnStatementBuilder.h index bbb805736f..0cc66fb197 100644 --- a/ets2panda/util/ast-builders/returnStatementBuilder.h +++ b/ets2panda/util/ast-builders/returnStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_RETURN_STATEMENT_BUILDER #include "ir/statements/returnStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/scriptFunctionBuilder.h b/ets2panda/util/ast-builders/scriptFunctionBuilder.h index 20beaf4914..5278c8b645 100644 --- a/ets2panda/util/ast-builders/scriptFunctionBuilder.h +++ b/ets2panda/util/ast-builders/scriptFunctionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_SCRIPT_FUNCTION_BUILDER #include "ir/base/scriptFunction.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/sequenceExpressionBuilder.h b/ets2panda/util/ast-builders/sequenceExpressionBuilder.h index 58a6170b5f..a66c15fa93 100644 --- a/ets2panda/util/ast-builders/sequenceExpressionBuilder.h +++ b/ets2panda/util/ast-builders/sequenceExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_SEQUENCE_EXPRESSION_BUILDER #include "ir/expressions/sequenceExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/stringLiteralBuilder.h b/ets2panda/util/ast-builders/stringLiteralBuilder.h index 0c01b52be1..6a8beecb58 100644 --- a/ets2panda/util/ast-builders/stringLiteralBuilder.h +++ b/ets2panda/util/ast-builders/stringLiteralBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_STRING_LITERAL_BUILDER #define ES2PANDA_UTIL_INCLUDE_STRING_LITERAL_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/literals/stringLiteral.h" diff --git a/ets2panda/util/ast-builders/superExpressionBuilder.h b/ets2panda/util/ast-builders/superExpressionBuilder.h index 22ec4f1a37..2db814842f 100644 --- a/ets2panda/util/ast-builders/superExpressionBuilder.h +++ b/ets2panda/util/ast-builders/superExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_SUPER_EXPRESSION_BUILDER #include "ir/expressions/superExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/switchCaseStatementBuilder.h b/ets2panda/util/ast-builders/switchCaseStatementBuilder.h index b378b05879..2e848fb315 100644 --- a/ets2panda/util/ast-builders/switchCaseStatementBuilder.h +++ b/ets2panda/util/ast-builders/switchCaseStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_SWITCH_CASE_STATEMENT_BUILDER #include "ir/statements/switchCaseStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/switchStatementBuilder.h b/ets2panda/util/ast-builders/switchStatementBuilder.h index f8abdf7b87..bda681f9d4 100644 --- a/ets2panda/util/ast-builders/switchStatementBuilder.h +++ b/ets2panda/util/ast-builders/switchStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_SWITCH_STATEMENT_BUILDER #include "ir/statements/switchStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/taggedTemplateExpressionBuilder.h b/ets2panda/util/ast-builders/taggedTemplateExpressionBuilder.h index 6a9d189edc..d2a083c740 100644 --- a/ets2panda/util/ast-builders/taggedTemplateExpressionBuilder.h +++ b/ets2panda/util/ast-builders/taggedTemplateExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TAGGED_TEMPLATE_EXPRESSION_BUILDER #include "ir/expressions/taggedTemplateExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/templateElementBuilder.h b/ets2panda/util/ast-builders/templateElementBuilder.h index 041a032b18..ad0ef8204b 100644 --- a/ets2panda/util/ast-builders/templateElementBuilder.h +++ b/ets2panda/util/ast-builders/templateElementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TEMPLATE_ELEMENT_BUILDER #include "ir/base/templateElement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/templateLiteralBuilder.h b/ets2panda/util/ast-builders/templateLiteralBuilder.h index d37b9d1ea6..85b05db537 100644 --- a/ets2panda/util/ast-builders/templateLiteralBuilder.h +++ b/ets2panda/util/ast-builders/templateLiteralBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TEMPLATE_LITERAL_BUILDER #include "ir/expressions/templateLiteral.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/thisExpressionBuilder.h b/ets2panda/util/ast-builders/thisExpressionBuilder.h index fb8e597e0a..7a685f6bec 100644 --- a/ets2panda/util/ast-builders/thisExpressionBuilder.h +++ b/ets2panda/util/ast-builders/thisExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_THIS_EXPRESSION_BUILDER #include "ir/expressions/thisExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/throwStatementBuilder.h b/ets2panda/util/ast-builders/throwStatementBuilder.h index 6346d3e192..8a9dad88cb 100644 --- a/ets2panda/util/ast-builders/throwStatementBuilder.h +++ b/ets2panda/util/ast-builders/throwStatementBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_THROW_STATEMENT_BUILDER #define ES2PANDA_UTIL_INCLUDE_THROW_STATEMENT_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/statements/throwStatement.h" diff --git a/ets2panda/util/ast-builders/tryStatementBuilder.h b/ets2panda/util/ast-builders/tryStatementBuilder.h index f0cdf897c8..15c0477d1a 100644 --- a/ets2panda/util/ast-builders/tryStatementBuilder.h +++ b/ets2panda/util/ast-builders/tryStatementBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_TRY_STATEMENT_BUILDER #define ES2PANDA_UTIL_INCLUDE_TRY_STATEMENT_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/statements/tryStatement.h" diff --git a/ets2panda/util/ast-builders/tsAnyKeywordBuilder.h b/ets2panda/util/ast-builders/tsAnyKeywordBuilder.h index d3318f753b..33c272a327 100644 --- a/ets2panda/util/ast-builders/tsAnyKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsAnyKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_ANY_KEYWORD_BUILDER #include "ir/ts/tsAnyKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsArrayTypeBuilder.h b/ets2panda/util/ast-builders/tsArrayTypeBuilder.h index f2d2d395b8..1cb629f744 100644 --- a/ets2panda/util/ast-builders/tsArrayTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsArrayTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_ARRAY_TYPE_BUILDER #include "ir/ts/tsArrayType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsAsExpressionBuilder.h b/ets2panda/util/ast-builders/tsAsExpressionBuilder.h index 38551c5f78..9b536eb66b 100644 --- a/ets2panda/util/ast-builders/tsAsExpressionBuilder.h +++ b/ets2panda/util/ast-builders/tsAsExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_AS_EXPRESSION_BUILDER #include "ir/ts/tsAsExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsBigintKeywordBuilder.h b/ets2panda/util/ast-builders/tsBigintKeywordBuilder.h index 2f8764e659..fbfadf5a13 100644 --- a/ets2panda/util/ast-builders/tsBigintKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsBigintKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_BIGINT_KEYWORD_BUILDER #include "ir/ts/tsBigintKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsBooleanKeywordBuilder.h b/ets2panda/util/ast-builders/tsBooleanKeywordBuilder.h index dc765ba079..e31f79bd87 100644 --- a/ets2panda/util/ast-builders/tsBooleanKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsBooleanKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_BOOLEAN_KEYWORD_BUILDER #include "ir/ts/tsBooleanKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsClassImplementsBuilder.h b/ets2panda/util/ast-builders/tsClassImplementsBuilder.h index 43a76eb79e..659a8eb972 100644 --- a/ets2panda/util/ast-builders/tsClassImplementsBuilder.h +++ b/ets2panda/util/ast-builders/tsClassImplementsBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_CLASS_IMPLEMENTS_BUILDER #include "ir/ts/tsClassImplements.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsConditionalTypeBuilder.h b/ets2panda/util/ast-builders/tsConditionalTypeBuilder.h index f0f4027575..f486565ed8 100644 --- a/ets2panda/util/ast-builders/tsConditionalTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsConditionalTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_CONDITIONAL_TYPE_BUILDER #include "ir/ts/tsConditionalType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsEnumDeclarationBuilder.h b/ets2panda/util/ast-builders/tsEnumDeclarationBuilder.h index bd123fffb2..46db127676 100644 --- a/ets2panda/util/ast-builders/tsEnumDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/tsEnumDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_ENUM_DECLARATION_BUILDER #include "ir/ts/tsEnumDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsEnumMemberBuilder.h b/ets2panda/util/ast-builders/tsEnumMemberBuilder.h index 987456a14c..8d2afba026 100644 --- a/ets2panda/util/ast-builders/tsEnumMemberBuilder.h +++ b/ets2panda/util/ast-builders/tsEnumMemberBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_ENUM_MEMBER_BUILDER #include "ir/ts/tsEnumMember.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsFunctionTypeBuilder.h b/ets2panda/util/ast-builders/tsFunctionTypeBuilder.h index d310aa8f31..bebe952ad0 100644 --- a/ets2panda/util/ast-builders/tsFunctionTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsFunctionTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_FUNCTION_TYPE_BUILDER #include "ir/ts/tsFunctionType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsImportEqualsDeclarationBuilder.h b/ets2panda/util/ast-builders/tsImportEqualsDeclarationBuilder.h index 2f897bf2fe..5ef785de91 100644 --- a/ets2panda/util/ast-builders/tsImportEqualsDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/tsImportEqualsDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_IMPORT_EQUALS_DECLARATION_BUILDER #include "ir/ts/tsImportEqualsDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsImportTypeBuilder.h b/ets2panda/util/ast-builders/tsImportTypeBuilder.h index 474ef5e7c1..41397a01bb 100644 --- a/ets2panda/util/ast-builders/tsImportTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsImportTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_IMPORT_TYPE_BUILDER #include "ir/ts/tsImportType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsIndexSignatureBuilder.h b/ets2panda/util/ast-builders/tsIndexSignatureBuilder.h index fd639e168e..ac0f50f22f 100644 --- a/ets2panda/util/ast-builders/tsIndexSignatureBuilder.h +++ b/ets2panda/util/ast-builders/tsIndexSignatureBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_INDEX_SIGNATURE_BUILDER #include "ir/base/tsIndexSignature.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsIndexedAccessTypeBuilder.h b/ets2panda/util/ast-builders/tsIndexedAccessTypeBuilder.h index 1df78d5cf4..a39c88bdc5 100644 --- a/ets2panda/util/ast-builders/tsIndexedAccessTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsIndexedAccessTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_INDEXED_ACCESS_TYPE_BUILDER #include "ir/ts/tsIndexedAccessType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsInferTypeBuilder.h b/ets2panda/util/ast-builders/tsInferTypeBuilder.h index 30d4d82c38..6fd9b18b83 100644 --- a/ets2panda/util/ast-builders/tsInferTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsInferTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_INFER_TYPE_BUILDER #include "ir/ts/tsInferType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsInterfaceBodyBuilder.h b/ets2panda/util/ast-builders/tsInterfaceBodyBuilder.h index ce62eb960a..cdfdfdd896 100644 --- a/ets2panda/util/ast-builders/tsInterfaceBodyBuilder.h +++ b/ets2panda/util/ast-builders/tsInterfaceBodyBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_INTERFACE_BODY_BUILDER #include "ir/ts/tsInterfaceBody.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsInterfaceHeritageBuilder.h b/ets2panda/util/ast-builders/tsInterfaceHeritageBuilder.h index dde7743544..a444caa086 100644 --- a/ets2panda/util/ast-builders/tsInterfaceHeritageBuilder.h +++ b/ets2panda/util/ast-builders/tsInterfaceHeritageBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_INTERFACE_HERITAGE_BUILDER #include "ir/ts/tsInterfaceHeritage.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsIntersectionTypeBuilder.h b/ets2panda/util/ast-builders/tsIntersectionTypeBuilder.h index 30f119ea56..34d510df1f 100644 --- a/ets2panda/util/ast-builders/tsIntersectionTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsIntersectionTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_INTERSECTION_TYPE_BUILDER #include "ir/ts/tsIntersectionType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsLiteralTypeBuilder.h b/ets2panda/util/ast-builders/tsLiteralTypeBuilder.h index 1a6ed0153d..417cab5f0d 100644 --- a/ets2panda/util/ast-builders/tsLiteralTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsLiteralTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_LITERAL_TYPE_BUILDER #include "ir/ts/tsLiteralType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsMappedTypeBuilder.h b/ets2panda/util/ast-builders/tsMappedTypeBuilder.h index 2dc1f7e794..229b2f15d5 100644 --- a/ets2panda/util/ast-builders/tsMappedTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsMappedTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_MAPPED_TYPE_BUILDER #include "ir/ts/tsMappedType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsMethodSignatureBuilder.h b/ets2panda/util/ast-builders/tsMethodSignatureBuilder.h index 2c5dac9090..e278a30db2 100644 --- a/ets2panda/util/ast-builders/tsMethodSignatureBuilder.h +++ b/ets2panda/util/ast-builders/tsMethodSignatureBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_METHOD_SIGNATURE_BUILDER #include "ir/base/tsMethodSignature.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsModuleBlockBuilder.h b/ets2panda/util/ast-builders/tsModuleBlockBuilder.h index b55abe5c87..ce3388f9c6 100644 --- a/ets2panda/util/ast-builders/tsModuleBlockBuilder.h +++ b/ets2panda/util/ast-builders/tsModuleBlockBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_MODULE_BLOCK_BUILDER #include "ir/ts/tsModuleBlock.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsModuleDeclarationBuilder.h b/ets2panda/util/ast-builders/tsModuleDeclarationBuilder.h index 39df8ce948..3cdb4fa24e 100644 --- a/ets2panda/util/ast-builders/tsModuleDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/tsModuleDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_MODULE_DECLARATION_BUILDER #include "ir/ts/tsModuleDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsNamedTupleMemberBuilder.h b/ets2panda/util/ast-builders/tsNamedTupleMemberBuilder.h index f0a962000b..de20796c2f 100644 --- a/ets2panda/util/ast-builders/tsNamedTupleMemberBuilder.h +++ b/ets2panda/util/ast-builders/tsNamedTupleMemberBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_NAMED_TUPLE_MEMBER_BUILDER #include "ir/ts/tsNamedTupleMember.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsNeverKeywordBuilder.h b/ets2panda/util/ast-builders/tsNeverKeywordBuilder.h index fbf8dc36d2..00047cfd63 100644 --- a/ets2panda/util/ast-builders/tsNeverKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsNeverKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_NEVER_KEYWORD_BUILDER #include "ir/ts/tsNeverKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsNonNullExpressionBuilder.h b/ets2panda/util/ast-builders/tsNonNullExpressionBuilder.h index 2696c2f6a2..e49938cf19 100644 --- a/ets2panda/util/ast-builders/tsNonNullExpressionBuilder.h +++ b/ets2panda/util/ast-builders/tsNonNullExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_NON_NULL_EXPRESSION_BUILDER #include "ir/ts/tsNonNullExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsNullKeywordBuilder.h b/ets2panda/util/ast-builders/tsNullKeywordBuilder.h index 75682522b7..ef47621c6d 100644 --- a/ets2panda/util/ast-builders/tsNullKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsNullKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_NULL_KEYWORD_BUILDER #include "ir/ts/tsNullKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsNumberKeywordBuilder.h b/ets2panda/util/ast-builders/tsNumberKeywordBuilder.h index b3b5afe74d..1c91eafbf8 100644 --- a/ets2panda/util/ast-builders/tsNumberKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsNumberKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_NUMBER_KEYWORD_BUILDER #include "ir/ts/tsNumberKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsObjectKeywordBuilder.h b/ets2panda/util/ast-builders/tsObjectKeywordBuilder.h index d77b36a7ce..561d9b0674 100644 --- a/ets2panda/util/ast-builders/tsObjectKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsObjectKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_OBJECT_KEYWORD_BUILDER #include "ir/ts/tsObjectKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsParenthesizedTypeBuilder.h b/ets2panda/util/ast-builders/tsParenthesizedTypeBuilder.h index bce9a97a48..e7903340ee 100644 --- a/ets2panda/util/ast-builders/tsParenthesizedTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsParenthesizedTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_PARENTHESIZED_TYPE_BUILDER #include "ir/ts/tsParenthesizedType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsPropertySignatureBuilder.h b/ets2panda/util/ast-builders/tsPropertySignatureBuilder.h index 85a510763c..fef0e2653a 100644 --- a/ets2panda/util/ast-builders/tsPropertySignatureBuilder.h +++ b/ets2panda/util/ast-builders/tsPropertySignatureBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_PROPERTY_SIGNATURE_BUILDER #include "ir/base/tsPropertySignature.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsSignatureDeclarationBuilder.h b/ets2panda/util/ast-builders/tsSignatureDeclarationBuilder.h index 5b001b7909..ec67ccdfb6 100644 --- a/ets2panda/util/ast-builders/tsSignatureDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/tsSignatureDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_SIGNATURE_DECLARATION_BUILDER #include "ir/base/tsSignatureDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsStringKeywordBuilder.h b/ets2panda/util/ast-builders/tsStringKeywordBuilder.h index 97c55b3dd0..79fe36c6b6 100644 --- a/ets2panda/util/ast-builders/tsStringKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsStringKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_STRING_KEYWORD_BUILDER #include "ir/ts/tsStringKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsThisTypeBuilder.h b/ets2panda/util/ast-builders/tsThisTypeBuilder.h index c422530e1a..cbb25695dc 100644 --- a/ets2panda/util/ast-builders/tsThisTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsThisTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_THIS_TYPE_BUILDER #include "ir/ts/tsThisType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTupleTypeBuilder.h b/ets2panda/util/ast-builders/tsTupleTypeBuilder.h index 1c5d79f48a..293db0db91 100644 --- a/ets2panda/util/ast-builders/tsTupleTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsTupleTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TUPLE_TYPE_BUILDER #include "ir/ts/tsTupleType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypeAliasDeclarationBuilder.h b/ets2panda/util/ast-builders/tsTypeAliasDeclarationBuilder.h index 0e5ac9d410..3a76e5c863 100644 --- a/ets2panda/util/ast-builders/tsTypeAliasDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/tsTypeAliasDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_ALIAS_DECLARATION_BUILDER #include "ir/ts/tsTypeAliasDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypeAssertionBuilder.h b/ets2panda/util/ast-builders/tsTypeAssertionBuilder.h index b669a1b45b..eb45d42812 100644 --- a/ets2panda/util/ast-builders/tsTypeAssertionBuilder.h +++ b/ets2panda/util/ast-builders/tsTypeAssertionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_ASSERTION_BUILDER #include "ir/ts/tsTypeAssertion.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypeLiteralBuilder.h b/ets2panda/util/ast-builders/tsTypeLiteralBuilder.h index b757adb9e6..57be8d3ca9 100644 --- a/ets2panda/util/ast-builders/tsTypeLiteralBuilder.h +++ b/ets2panda/util/ast-builders/tsTypeLiteralBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_LITERAL_BUILDER #include "ir/ts/tsTypeLiteral.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypeOperatorBuilder.h b/ets2panda/util/ast-builders/tsTypeOperatorBuilder.h index d7686e9a0a..e3db2da184 100644 --- a/ets2panda/util/ast-builders/tsTypeOperatorBuilder.h +++ b/ets2panda/util/ast-builders/tsTypeOperatorBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_OPERATOR_BUILDER #include "ir/ts/tsTypeOperator.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypeParameterBuilder.h b/ets2panda/util/ast-builders/tsTypeParameterBuilder.h index 725d278c6b..4df6458635 100644 --- a/ets2panda/util/ast-builders/tsTypeParameterBuilder.h +++ b/ets2panda/util/ast-builders/tsTypeParameterBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_PARAMETER_BUILDER #include "ir/ts/tsTypeParameter.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypeParameterDeclarationBuilder.h b/ets2panda/util/ast-builders/tsTypeParameterDeclarationBuilder.h index dbceb6e6de..f46f210e30 100644 --- a/ets2panda/util/ast-builders/tsTypeParameterDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/tsTypeParameterDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_PARAMETER_DECLARATION_BUILDER #include "ir/ts/tsTypeParameterDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypeParameterInstantiationBuilder.h b/ets2panda/util/ast-builders/tsTypeParameterInstantiationBuilder.h index 64e15871fb..46ebbda740 100644 --- a/ets2panda/util/ast-builders/tsTypeParameterInstantiationBuilder.h +++ b/ets2panda/util/ast-builders/tsTypeParameterInstantiationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_PARAMETER_INSTANTIATION_BUILDER #include "ir/ts/tsTypeParameterInstantiation.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypePredicateBuilder.h b/ets2panda/util/ast-builders/tsTypePredicateBuilder.h index 876ac7541d..e829bb69c0 100644 --- a/ets2panda/util/ast-builders/tsTypePredicateBuilder.h +++ b/ets2panda/util/ast-builders/tsTypePredicateBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_PREDICATE_BUILDER #include "ir/ts/tsTypePredicate.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypeQueryBuilder.h b/ets2panda/util/ast-builders/tsTypeQueryBuilder.h index 87976be6f3..ed129ea5ca 100644 --- a/ets2panda/util/ast-builders/tsTypeQueryBuilder.h +++ b/ets2panda/util/ast-builders/tsTypeQueryBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_QUERY_BUILDER #include "ir/ts/tsTypeQuery.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsTypeReferenceBuilder.h b/ets2panda/util/ast-builders/tsTypeReferenceBuilder.h index 9d76d0dd4a..c758d92232 100644 --- a/ets2panda/util/ast-builders/tsTypeReferenceBuilder.h +++ b/ets2panda/util/ast-builders/tsTypeReferenceBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_TYPE_REFERENCE_BUILDER #include "ir/ts/tsTypeReference.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsUndefinedKeywordBuilder.h b/ets2panda/util/ast-builders/tsUndefinedKeywordBuilder.h index 580f9642af..9bdf60f922 100644 --- a/ets2panda/util/ast-builders/tsUndefinedKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsUndefinedKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_UNDEFINED_KEYWORD_BUILDER #include "ir/ts/tsUndefinedKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsUnionTypeBuilder.h b/ets2panda/util/ast-builders/tsUnionTypeBuilder.h index 0160893594..ee9c4e3334 100644 --- a/ets2panda/util/ast-builders/tsUnionTypeBuilder.h +++ b/ets2panda/util/ast-builders/tsUnionTypeBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_UNION_TYPE_BUILDER #include "ir/ts/tsUnionType.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsUnknownKeywordBuilder.h b/ets2panda/util/ast-builders/tsUnknownKeywordBuilder.h index df1d97fe8a..b0c6b0cbec 100644 --- a/ets2panda/util/ast-builders/tsUnknownKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsUnknownKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_UNKNOWN_KEYWORD_BUILDER #include "ir/ts/tsUnknownKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/tsVoidKeywordBuilder.h b/ets2panda/util/ast-builders/tsVoidKeywordBuilder.h index e69a460552..10e7f88553 100644 --- a/ets2panda/util/ast-builders/tsVoidKeywordBuilder.h +++ b/ets2panda/util/ast-builders/tsVoidKeywordBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_TS_VOID_KEYWORD_BUILDER #include "ir/ts/tsVoidKeyword.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/typeofExpressionBuilder.h b/ets2panda/util/ast-builders/typeofExpressionBuilder.h index d0d4f74ed3..5deff706b9 100644 --- a/ets2panda/util/ast-builders/typeofExpressionBuilder.h +++ b/ets2panda/util/ast-builders/typeofExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_TYPEOF_EXPRESSION_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_TYPEOF_EXPRESSION_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/typeofExpression.h" diff --git a/ets2panda/util/ast-builders/unaryExpressionBuilder.h b/ets2panda/util/ast-builders/unaryExpressionBuilder.h index f9608a05cc..561022b754 100644 --- a/ets2panda/util/ast-builders/unaryExpressionBuilder.h +++ b/ets2panda/util/ast-builders/unaryExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_UNARY_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_UNARY_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/unaryExpression.h" diff --git a/ets2panda/util/ast-builders/undefinedLiteralBuilder.h b/ets2panda/util/ast-builders/undefinedLiteralBuilder.h index be0cd204ee..9dc04eff44 100644 --- a/ets2panda/util/ast-builders/undefinedLiteralBuilder.h +++ b/ets2panda/util/ast-builders/undefinedLiteralBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_UNDEFINED_LITERAL_BUILDER #include "ir/expressions/literals/undefinedLiteral.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/updateExpressionBuilder.h b/ets2panda/util/ast-builders/updateExpressionBuilder.h index 12acd83f44..59e126d927 100644 --- a/ets2panda/util/ast-builders/updateExpressionBuilder.h +++ b/ets2panda/util/ast-builders/updateExpressionBuilder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_INCLUDE_UPDATE_EXPRESSION_BUILDER #define ES2PANDA_UTIL_INCLUDE_UPDATE_EXPRESSION_BUILDER -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" #include "ir/expressions/updateExpression.h" diff --git a/ets2panda/util/ast-builders/variableDeclarationBuilder.h b/ets2panda/util/ast-builders/variableDeclarationBuilder.h index 269d4f7839..3a051e115a 100644 --- a/ets2panda/util/ast-builders/variableDeclarationBuilder.h +++ b/ets2panda/util/ast-builders/variableDeclarationBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_VARIABLE_DECLARATION_BUILDER #include "ir/statements/variableDeclaration.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/variableDeclaratorBuilder.h b/ets2panda/util/ast-builders/variableDeclaratorBuilder.h index 2319e1a066..4b10393b0a 100644 --- a/ets2panda/util/ast-builders/variableDeclaratorBuilder.h +++ b/ets2panda/util/ast-builders/variableDeclaratorBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_VARIABLE_DECLARATOR_BUILDER #include "ir/statements/variableDeclarator.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/whileStatementBuilder.h b/ets2panda/util/ast-builders/whileStatementBuilder.h index d53213bc6d..183571c509 100644 --- a/ets2panda/util/ast-builders/whileStatementBuilder.h +++ b/ets2panda/util/ast-builders/whileStatementBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_WHILE_STATEMENT_BUILDER #include "ir/statements/whileStatement.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/ast-builders/yieldExpressionBuilder.h b/ets2panda/util/ast-builders/yieldExpressionBuilder.h index 07e46d781c..7a8f729ba4 100644 --- a/ets2panda/util/ast-builders/yieldExpressionBuilder.h +++ b/ets2panda/util/ast-builders/yieldExpressionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_YIELD_EXPRESSION_BUILDER #include "ir/expressions/yieldExpression.h" -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" #include "astBuilder.h" namespace ark::es2panda::ir { diff --git a/ets2panda/util/doubleLinkedList.h b/ets2panda/util/doubleLinkedList.h index a4d5a5a919..7feb2deb26 100644 --- a/ets2panda/util/doubleLinkedList.h +++ b/ets2panda/util/doubleLinkedList.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_DOUBLE_LINKED_LIST_H #define ES2PANDA_UTIL_DOUBLE_LINKED_LIST_H -#include "mem/arena_allocator.h" +#include "../libarkbase/mem/arena_allocator.h" namespace ark::es2panda::util { diff --git a/ets2panda/util/dtoa_helper.cpp b/ets2panda/util/dtoa_helper.cpp index 05a259cf90..1bbd460b8a 100644 --- a/ets2panda/util/dtoa_helper.cpp +++ b/ets2panda/util/dtoa_helper.cpp @@ -14,8 +14,8 @@ */ #include "dtoa_helper.h" -#include "libpandabase/macros.h" -#include "globals.h" +#include "../libarkbase/macros.h" +#include "../libarkbase/globals.h" // Almost copy of ets_runtime/ecmascript/base/dtoa_helper.cpp namespace ark::es2panda::util { diff --git a/ets2panda/util/dtoa_helper.h b/ets2panda/util/dtoa_helper.h index 2a5fbac26f..2c742822c7 100644 --- a/ets2panda/util/dtoa_helper.h +++ b/ets2panda/util/dtoa_helper.h @@ -19,7 +19,7 @@ #include #include #include -#include "globals.h" +#include "../libarkbase/globals.h" #include "util/es2pandaMacros.h" // Almost copy of ets_runtime/ecmascript/base/dtoa_helper.h diff --git a/ets2panda/util/es2pandaMacros.h b/ets2panda/util/es2pandaMacros.h index 6764fadf6a..28f2fed7a3 100644 --- a/ets2panda/util/es2pandaMacros.h +++ b/ets2panda/util/es2pandaMacros.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_UTIL_ES2PANDA_MACROS_H #define ES2PANDA_UTIL_ES2PANDA_MACROS_H -#include "macros.h" +#include "../libarkbase/macros.h" #include "lexer/token/sourceLocation.h" namespace ark::es2panda::parser { diff --git a/ets2panda/util/helpers.cpp b/ets2panda/util/helpers.cpp index 9bde843fb2..22f0206f01 100644 --- a/ets2panda/util/helpers.cpp +++ b/ets2panda/util/helpers.cpp @@ -51,7 +51,7 @@ #include "ir/ts/tsInterfaceDeclaration.h" #include "ir/ts/tsEnumDeclaration.h" -#include "libpandabase/utils/utf.h" +#include "../libarkbase/utils/utf.h" namespace ark::es2panda::util { // Helpers diff --git a/ets2panda/util/helpers.h b/ets2panda/util/helpers.h index 841f006566..deaa89143c 100644 --- a/ets2panda/util/helpers.h +++ b/ets2panda/util/helpers.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_HELPERS_H #include "varbinder/variableFlags.h" -#include "mem/pool_manager.h" +#include "../libarkbase/mem/pool_manager.h" #include "util/ustring.h" #include "ir/module/importSpecifier.h" diff --git a/ets2panda/util/importPathManager.cpp b/ets2panda/util/importPathManager.cpp index 7cf0466927..dabf2d9d19 100644 --- a/ets2panda/util/importPathManager.cpp +++ b/ets2panda/util/importPathManager.cpp @@ -15,7 +15,7 @@ #include "importPathManager.h" #include "es2panda.h" -#include +#include <../libarkbase/os/filesystem.h> #include "util/arktsconfig.h" #include "util/diagnostic.h" #include "util/diagnosticEngine.h" diff --git a/ets2panda/util/options.cpp b/ets2panda/util/options.cpp index 9f42bc27ab..90926fbdf6 100644 --- a/ets2panda/util/options.cpp +++ b/ets2panda/util/options.cpp @@ -17,8 +17,8 @@ #include "util/diagnostic.h" #include "util/diagnosticEngine.h" #include "util/ustring.h" -#include "os/filesystem.h" -#include "utils/pandargs.h" +#include "../libarkbase/os/filesystem.h" +#include "../libarkbase/utils/pandargs.h" #include "arktsconfig.h" #include "generated/diagnostic.h" diff --git a/ets2panda/util/options.h b/ets2panda/util/options.h index 47e693e74c..bc567876c6 100644 --- a/ets2panda/util/options.h +++ b/ets2panda/util/options.h @@ -16,10 +16,10 @@ #ifndef ES2PANDA_UTIL_OPTIONS_H #define ES2PANDA_UTIL_OPTIONS_H -#include "libpandabase/os/file.h" -#include "libpandabase/utils/logger.h" +#include "../libarkbase/os/file.h" +#include "../libarkbase/utils/logger.h" #include "util/helpers.h" -#include "utils/pandargs.h" +#include "../libarkbase/utils/pandargs.h" #include "arktsconfig.h" #include "es2panda.h" diff --git a/ets2panda/util/path.cpp b/ets2panda/util/path.cpp index 995424b524..887462f199 100644 --- a/ets2panda/util/path.cpp +++ b/ets2panda/util/path.cpp @@ -15,7 +15,7 @@ #include #include -#include "os/filesystem.h" +#include "../libarkbase/os/filesystem.h" #include "path.h" namespace ark::es2panda::util { diff --git a/ets2panda/util/plugin.cpp b/ets2panda/util/plugin.cpp index cf883368aa..e9f7458028 100644 --- a/ets2panda/util/plugin.cpp +++ b/ets2panda/util/plugin.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ #include "plugin.h" -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" namespace ark::es2panda::util { diff --git a/ets2panda/util/plugin.h b/ets2panda/util/plugin.h index a09113ac0b..bc1592aee2 100644 --- a/ets2panda/util/plugin.h +++ b/ets2panda/util/plugin.h @@ -16,7 +16,7 @@ #define ES2PANDA_UTIL_PLUGINS_H #include "util/es2pandaMacros.h" -#include "os/library_loader.h" +#include "../libarkbase/os/library_loader.h" #include "public/es2panda_lib.h" #include "util/ustring.h" diff --git a/ets2panda/util/ustring.h b/ets2panda/util/ustring.h index be6a745d60..ec82563274 100644 --- a/ets2panda/util/ustring.h +++ b/ets2panda/util/ustring.h @@ -17,7 +17,7 @@ #define ES2PANDA_UTIL_INCLUDE_USTRING_H #include "util/es2pandaMacros.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include #include diff --git a/ets2panda/varbinder/recordTable.h b/ets2panda/varbinder/recordTable.h index 437a2ffb79..78299a2bda 100644 --- a/ets2panda/varbinder/recordTable.h +++ b/ets2panda/varbinder/recordTable.h @@ -17,7 +17,7 @@ #define ES2PANDA_VARBINDER_RECORDTABLE_H #include "util/es2pandaMacros.h" -#include "utils/arena_containers.h" +#include "../libarkbase/utils/arena_containers.h" #include "util/ustring.h" #include "util/enumbitops.h" -- Gitee