diff --git a/BUILD.gn b/BUILD.gn index 821a7f6f66e7bf23919b3fe12664e477b053e4f7..290cac9e7e4ebcef87da7e572a15122988b9ab3a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -20,6 +20,7 @@ config("libes2panda_public_config") { "$ark_third_party_root/icu/icu4c/source/common", "$ark_third_party_root/icu/icu4c/source/i18n", "$ark_third_party_root/icu/icu4c/source/", + "$ark_es2panda_root", ] } @@ -347,7 +348,8 @@ config("libes2panda_config") { cflags_cc = [ "-fexceptions", "-Werror=shadow", - "-DDEFAULT_ARKTSCONFIG=\"$build_gen_root/plugins/ecmascript/es2panda/generated/arktsconfig.json\"" + # TODO(vpukhov): adjust es2panda path + "-DDEFAULT_ARKTSCONFIG=\"$build_gen_root/plugins/es2panda/generated/arktsconfig.json\"" ] } diff --git a/aot/BUILD.gn b/aot/BUILD.gn index f83342c8b3d1ee69afbe8f2851f2e6a0a1949a68..584d01b73a776c744f1a24bbfe781daa46de1ca2 100644 --- a/aot/BUILD.gn +++ b/aot/BUILD.gn @@ -27,13 +27,14 @@ ohos_executable("es2panda") { build_gen_root = rebase_path(root_gen_dir) cflags_cc = [ - "-DDEFAULT_ARKTSCONFIG=\"$build_gen_root/plugins/ecmascript/es2panda/generated/arktsconfig.json\"" + # TODO(vpukhov): adjust es2panda path + "-DDEFAULT_ARKTSCONFIG=\"$build_gen_root/plugins/es2panda/generated/arktsconfig.json\"" ] configs = [ sdk_libc_secshared_config, "$ark_root:ark_config", - "$ark_root/plugins/ecmascript/es2panda:libes2panda_public_config", + "$ark_es2panda_root:libes2panda_public_config", "$ark_root/assembler:arkassembler_public_config", "$ark_root/libpandafile:arkfile_public_config", "$ark_root/libpandabase:arkbase_public_config", @@ -43,7 +44,7 @@ ohos_executable("es2panda") { ] deps = [ - "$ark_root/plugins/ecmascript/es2panda:libes2panda_frontend_static", + "$ark_es2panda_root:libes2panda_frontend_static", "$ark_root/assembler:libarkassembler_frontend_static", "$ark_root/libpandafile:libarkfile_frontend_static", "$ark_root/libpandabase:libarkbase_frontend_static", diff --git a/aot/CMakeLists.txt b/aot/CMakeLists.txt index 41081aa9c25ab1608d3698701c809c4c4c261ec1..0d453aac81a14b05f88aad98b20245749a8bc24a 100644 --- a/aot/CMakeLists.txt +++ b/aot/CMakeLists.txt @@ -19,6 +19,7 @@ set(ES2PANDA_AOT_SRC panda_add_executable(es2panda ${ES2PANDA_AOT_SRC}) panda_target_link_libraries(es2panda es2panda-lib arkassembler arkbytecodeopt) panda_target_include_directories(es2panda PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +panda_target_include_directories(es2panda PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) if (PANDA_FUZZILLI) panda_target_compile_options(es2panda diff --git a/aot/main.cpp b/aot/main.cpp index 2b4de63a51e9719d29acd290a10c54e8185a1ac9..2e02b1a3c94e890b5fa58dc68360b3c38fa216f5 100644 --- a/aot/main.cpp +++ b/aot/main.cpp @@ -19,8 +19,8 @@ #include "mem/arena_allocator.h" #include "mem/pool_manager.h" #include "options.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/util/arktsconfig.h" +#include "es2panda.h" +#include "util/arktsconfig.h" #include #include diff --git a/aot/options.cpp b/aot/options.cpp index 31575ae21eda6969f7153cb3db21bd0e1a7c7062..c5a15797fb19be31747698c3fd296f39657642b6 100644 --- a/aot/options.cpp +++ b/aot/options.cpp @@ -239,6 +239,13 @@ bool Options::Parse(int argc, const char **argv) } } +#ifndef PANDA_WITH_ECMASCRIPT + if (extension_ == es2panda::ScriptExtension::JS) { + error_msg_ = "js extension is not supported within current build"; + return false; + } +#endif + if (extension_ != es2panda::ScriptExtension::JS && op_module.GetValue()) { error_msg_ = "Error: --module is not supported for this extension."; return false; diff --git a/aot/options.h b/aot/options.h index 0fd7be7e4c546068ef6e5e2129be888cb0bf3d8b..c7e07c6973f70d1ede2ab5dd1883ef30127d6191 100644 --- a/aot/options.h +++ b/aot/options.h @@ -17,8 +17,8 @@ #define ES2PANDA_AOT_OPTIONS_H #include "libpandabase/os/file.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "es2panda.h" +#include "util/helpers.h" #include #include diff --git a/binder/ASBinder.h b/binder/ASBinder.h index ac6c8b22ec9131397f9e5ddee1698e714c907080..edb51793c8b80ebcde5479772bb77d49082007b7 100644 --- a/binder/ASBinder.h +++ b/binder/ASBinder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_BINDER_AS_BINDER_H #define ES2PANDA_BINDER_AS_BINDER_H -#include "plugins/ecmascript/es2panda/binder/binder.h" +#include "binder/binder.h" namespace panda::es2panda::binder { class ASBinder : public Binder { diff --git a/binder/ETSBinder.cpp b/binder/ETSBinder.cpp index 9628a5e7f7443e177ee4bf69bb2ec8acca98b01b..e4ba26aae5e0a344cc9455ee933457ce7b9d3674 100644 --- a/binder/ETSBinder.cpp +++ b/binder/ETSBinder.cpp @@ -15,49 +15,49 @@ #include "ETSBinder.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/thisExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/classElement.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/classStaticBlock.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/functionDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsPrimitiveType.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewClassInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsScript.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsImportDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsClassImplements.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceHeritage.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/ir/module/importDefaultSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importNamespaceSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/importSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/thisExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/classElement.h" +#include "ir/base/classDefinition.h" +#include "ir/base/classProperty.h" +#include "ir/base/classStaticBlock.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/functionDeclaration.h" +#include "ir/statements/returnStatement.h" +#include "ir/ets/etsPrimitiveType.h" +#include "ir/ets/etsTypeReferencePart.h" +#include "ir/ets/etsNewClassInstanceExpression.h" +#include "ir/ets/etsTypeReference.h" +#include "ir/ets/etsFunctionType.h" +#include "ir/ets/etsScript.h" +#include "ir/ets/etsImportDeclaration.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "ir/ts/tsClassImplements.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsEnumMember.h" +#include "ir/ts/tsInterfaceHeritage.h" +#include "ir/ts/tsInterfaceBody.h" +#include "ir/ts/tsFunctionType.h" +#include "ir/ts/tsQualifiedName.h" +#include "ir/module/importDefaultSpecifier.h" +#include "ir/module/importNamespaceSpecifier.h" +#include "ir/module/importDeclaration.h" +#include "ir/module/importSpecifier.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "parser/program/program.h" +#include "util/helpers.h" +#include "util/ustring.h" +#include "checker/types/type.h" +#include "checker/types/ets/types.h" namespace panda::es2panda::binder { diff --git a/binder/ETSBinder.h b/binder/ETSBinder.h index 38ceaf5d0a1a2769a38dfd6423b8f1338ee2cc53..2696a8a6094a600ed201fde98bd5f9438e1d84b4 100644 --- a/binder/ETSBinder.h +++ b/binder/ETSBinder.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_BINDER_ETS_BINDER_H #define ES2PANDA_BINDER_ETS_BINDER_H -#include "plugins/ecmascript/es2panda/binder/TypedBinder.h" -#include "plugins/ecmascript/es2panda/binder/recordTable.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsImportDeclaration.h" +#include "binder/TypedBinder.h" +#include "binder/recordTable.h" +#include "ir/ets/etsImportDeclaration.h" namespace panda::es2panda::binder { diff --git a/binder/JSBinder.h b/binder/JSBinder.h index af3178f4fbccaf2d1330a058d0febb4911288d1e..0768f3bcc6cb5f07c1568dada9a469527e5c784b 100644 --- a/binder/JSBinder.h +++ b/binder/JSBinder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_BINDER_JS_BINDER_H #define ES2PANDA_BINDER_JS_BINDER_H -#include "plugins/ecmascript/es2panda/binder/binder.h" +#include "binder/binder.h" namespace panda::es2panda::binder { class JSBinder : public Binder { diff --git a/binder/TSBinder.h b/binder/TSBinder.h index 30b11582990cd14984f62e002bbe0bd89ba0909c..da79cc8b92e9b4dfe14c0977df6d2c72f467a9c5 100644 --- a/binder/TSBinder.h +++ b/binder/TSBinder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_BINDER_TS_BINDER_H #define ES2PANDA_BINDER_TS_BINDER_H -#include "plugins/ecmascript/es2panda/binder/TypedBinder.h" +#include "binder/TypedBinder.h" namespace panda::es2panda::binder { class TSBinder : public TypedBinder { diff --git a/binder/TypedBinder.cpp b/binder/TypedBinder.cpp index 57352cf0a37f7ef0460c5279303f0f538e1d3083..0c81a1617f02788132f2d3b0522803d2201b6491 100644 --- a/binder/TypedBinder.cpp +++ b/binder/TypedBinder.cpp @@ -14,11 +14,11 @@ */ #include "TypedBinder.h" -#include "plugins/ecmascript/es2panda/ir/base/tsSignatureDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/base/tsMethodSignature.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsConstructorType.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsFunctionType.h" +#include "ir/base/tsSignatureDeclaration.h" +#include "ir/base/tsMethodSignature.h" +#include "ir/ts/tsFunctionType.h" +#include "ir/ts/tsConstructorType.h" +#include "ir/ets/etsFunctionType.h" namespace panda::es2panda::binder { diff --git a/binder/TypedBinder.h b/binder/TypedBinder.h index aac7c7b0c382fba6e46d3e7add37a051bc88e4dc..254732d0935549588b9bd5cdbb887b13497a603e 100644 --- a/binder/TypedBinder.h +++ b/binder/TypedBinder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_BINDER_TYPED_BINDER_H #define ES2PANDA_BINDER_TYPED_BINDER_H -#include "plugins/ecmascript/es2panda/binder/binder.h" +#include "binder/binder.h" namespace panda::es2panda::binder { class TypedBinder : public Binder { diff --git a/binder/binder.cpp b/binder/binder.cpp index 322146e9db0230eddf187d032dbc1cb5e1c02bb7..2c0650c5c6d81d4963b2f2582df6782f774b08fb 100644 --- a/binder/binder.cpp +++ b/binder/binder.cpp @@ -15,48 +15,48 @@ #include "binder.h" -#include "plugins/ecmascript/es2panda/binder/privateBinding.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/tsBinding.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/base/catchClause.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/classStaticBlock.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/doWhileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/forInStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/forOfStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/forUpdateStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/ifStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/whileStatement.h" -#include "plugins/ecmascript/es2panda/ir/module/exportNamedDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsConstructorType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewClassInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/base/tsSignatureDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/base/tsMethodSignature.h" +#include "binder/privateBinding.h" +#include "parser/program/program.h" +#include "util/helpers.h" +#include "binder/scope.h" +#include "binder/tsBinding.h" +#include "compiler/core/compilerContext.h" +#include "es2panda.h" +#include "ir/astNode.h" +#include "ir/base/catchClause.h" +#include "ir/base/classDefinition.h" +#include "ir/base/classProperty.h" +#include "ir/base/classStaticBlock.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/property.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/spreadElement.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/objectExpression.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/doWhileStatement.h" +#include "ir/statements/forInStatement.h" +#include "ir/statements/forOfStatement.h" +#include "ir/statements/forUpdateStatement.h" +#include "ir/statements/ifStatement.h" +#include "ir/statements/switchStatement.h" +#include "ir/statements/variableDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/whileStatement.h" +#include "ir/module/exportNamedDeclaration.h" +#include "ir/module/importDeclaration.h" +#include "ir/ts/tsFunctionType.h" +#include "ir/ts/tsConstructorType.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ts/tsTypeReference.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ets/etsNewClassInstanceExpression.h" +#include "ir/ets/etsTypeReference.h" +#include "ir/base/tsSignatureDeclaration.h" +#include "ir/base/tsMethodSignature.h" namespace panda::es2panda::binder { void Binder::InitTopScope() diff --git a/binder/binder.h b/binder/binder.h index c59d48692fac3513aca4d3ba9218989e12394e38..fdeb9556c554988d403d3ee0cd9a2c47062a1eac 100644 --- a/binder/binder.h +++ b/binder/binder.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_BINDER_BINDER_H #define ES2PANDA_BINDER_BINDER_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" +#include "binder/scope.h" +#include "binder/variableFlags.h" +#include "lexer/token/sourceLocation.h" #include "macros.h" namespace panda::es2panda::parser { diff --git a/binder/declaration.h b/binder/declaration.h index b9c54af2a7e8e2c28c71778ded42789e4171a71a..86f26b8c7ba35d8d90e8a17d62e478cb3f43b1e1 100644 --- a/binder/declaration.h +++ b/binder/declaration.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_COMPILER_SCOPES_DECLARATION_H #define ES2PANDA_COMPILER_SCOPES_DECLARATION_H -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" +#include "binder/variableFlags.h" #include "macros.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class AstNode; diff --git a/binder/enumMemberResult.h b/binder/enumMemberResult.h index a3c5da93ee31c7ebe4a47b2e274194cd73d23a64..9182118c5b0ad5df1172cb9755331a532de1d490 100644 --- a/binder/enumMemberResult.h +++ b/binder/enumMemberResult.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_SCOPES_ENUM_MEMBER_RESULT_H #define ES2PANDA_COMPILER_SCOPES_ENUM_MEMBER_RESULT_H -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" #include diff --git a/binder/privateBinding.h b/binder/privateBinding.h index e9352f0503a64703cf1bbc084ab535d0d2ea41bb..15a8761982674a55c715965bfd6ed8de455a0b85 100644 --- a/binder/privateBinding.h +++ b/binder/privateBinding.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_BINDER_PRIVATE_BINDING_H #define ES2PANDA_BINDER_PRIVATE_BINDING_H -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" namespace panda::es2panda::binder { class PrivateBinding : public util::UString { diff --git a/binder/recordTable.cpp b/binder/recordTable.cpp index a39f41cba196ef1d4c98d6bf07d78fd2407b4993..71590bdfbf272c905e9e4dd9a8b74ef436752deb 100644 --- a/binder/recordTable.cpp +++ b/binder/recordTable.cpp @@ -14,12 +14,12 @@ */ #include "recordTable.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" +#include "parser/program/program.h" +#include "binder/ETSBinder.h" +#include "ir/base/classDefinition.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsInterfaceDeclaration.h" #include "generated/signatures.h" namespace panda::es2panda::binder { diff --git a/binder/recordTable.h b/binder/recordTable.h index 5e00b2ecbdf2d81538dcc05be80b7af74966d97e..59cf5ef16d83582497f1be8e4fbf26b29381a8bf 100644 --- a/binder/recordTable.h +++ b/binder/recordTable.h @@ -18,8 +18,8 @@ #include "macros.h" #include "utils/arena_containers.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "util/ustring.h" +#include "util/enumbitops.h" namespace panda::es2panda::parser { class Program; diff --git a/binder/scope.cpp b/binder/scope.cpp index 14018e8dc628a3960d090a6c59d80abc9aa475ff..22f53e1d214257b3c8091fb2803ee1f151c8bf9a 100644 --- a/binder/scope.cpp +++ b/binder/scope.cpp @@ -15,31 +15,31 @@ #include "scope.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/tsBinding.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/module/exportAllDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportNamedDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/booleanLiteral.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" +#include "binder/declaration.h" +#include "util/helpers.h" +#include "binder/tsBinding.h" +#include "binder/variable.h" +#include "binder/variableFlags.h" +#include "ir/astNode.h" +#include "ir/expressions/identifier.h" +#include "ir/statements/classDeclaration.h" +#include "ir/base/classDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/classProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/module/exportAllDeclaration.h" +#include "ir/module/exportNamedDeclaration.h" +#include "ir/module/exportSpecifier.h" +#include "ir/module/importDeclaration.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/literals/booleanLiteral.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "compiler/base/literals.h" +#include "compiler/core/compilerContext.h" #include "macros.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" #include "generated/signatures.h" #include diff --git a/binder/scope.h b/binder/scope.h index 58791e1c443f136332a6627ce79cb13903dee43a..57a16b50bf75eec1085c4ac2b33f15a9e993ac60 100644 --- a/binder/scope.h +++ b/binder/scope.h @@ -16,11 +16,11 @@ #ifndef ES2PANDA_COMPILER_SCOPES_SCOPE_H #define ES2PANDA_COMPILER_SCOPES_SCOPE_H -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "binder/declaration.h" +#include "binder/variable.h" +#include "es2panda.h" +#include "util/enumbitops.h" +#include "util/ustring.h" #include #include diff --git a/binder/tsBinding.h b/binder/tsBinding.h index 41d340315118f8148f03ed0ba0df4443920e9a7f..eb845ee65fa093165e8fedcc55e3ec3c2e3e7fb8 100644 --- a/binder/tsBinding.h +++ b/binder/tsBinding.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_BINDER_TS_BINDING_H #define ES2PANDA_BINDER_TS_BINDING_H -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" #include diff --git a/binder/variable.cpp b/binder/variable.cpp index 2a5d713fd7c9ab1201e2352d1975547ea2fd4651..ea807ca31b2b66abe7cc23780b166384a92dca53 100644 --- a/binder/variable.cpp +++ b/binder/variable.cpp @@ -15,7 +15,7 @@ #include "variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" +#include "binder/scope.h" #include diff --git a/binder/variable.h b/binder/variable.h index 17a71109381451c33f1a98e8dfab24ba4c130f0d..43605ba965f1eb6a646c73ad72f77d871979a2ed 100644 --- a/binder/variable.h +++ b/binder/variable.h @@ -16,11 +16,11 @@ #ifndef ES2PANDA_COMPILER_SCOPES_VARIABLE_H #define ES2PANDA_COMPILER_SCOPES_VARIABLE_H -#include "plugins/ecmascript/es2panda/binder/enumMemberResult.h" -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "binder/enumMemberResult.h" +#include "binder/variableFlags.h" +#include "ir/irnode.h" #include "macros.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" #include diff --git a/binder/variableFlags.h b/binder/variableFlags.h index 00dc73fbfbcc741b30d8f0c782f3d82696b8b291..49e8603c3c3b917c42a4cc1bf4150dfd7cac0860 100644 --- a/binder/variableFlags.h +++ b/binder/variableFlags.h @@ -17,7 +17,7 @@ #define ES2PANDA_COMPILER_SCOPES_VARIABLE_FLAGS_H #include -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "util/enumbitops.h" namespace panda::es2panda::binder { // NOLINTNEXTLINE(cppcoreguidelines-macro-usage) diff --git a/checker/ASchecker.cpp b/checker/ASchecker.cpp index ffb07d9ead29ea4013e5ff7b684903c0acb4be8c..e0132644267eebd4f92c10d2ead2196b83e5955c 100644 --- a/checker/ASchecker.cpp +++ b/checker/ASchecker.cpp @@ -14,7 +14,7 @@ */ #include "ASchecker.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" +#include "parser/program/program.h" namespace panda::es2panda::checker { diff --git a/checker/ASchecker.h b/checker/ASchecker.h index d5dcaea2ab791f592332f4536caeaaf065975dbb..9d6d36a6c21dd23ee768c79371e12881238c692a 100644 --- a/checker/ASchecker.h +++ b/checker/ASchecker.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_CHECKER_AS_CHECKER_H #define ES2PANDA_CHECKER_AS_CHECKER_H -#include "plugins/ecmascript/es2panda/checker/checker.h" +#include "checker/checker.h" namespace panda::es2panda::checker { diff --git a/checker/ETSchecker.cpp b/checker/ETSchecker.cpp index 3c826f67c4ad4008bff608fc3ff3155abda65bfc..d04615ca8c3e31779d3fe88865152309780dd080 100644 --- a/checker/ETSchecker.cpp +++ b/checker/ETSchecker.cpp @@ -15,17 +15,17 @@ #include "ETSchecker.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/checker/ets/aliveAnalyzer.h" - -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "es2panda.h" +#include "ir/expression.h" +#include "ir/base/classDefinition.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/statements/blockStatement.h" +#include "binder/ETSBinder.h" +#include "parser/program/program.h" +#include "checker/ets/aliveAnalyzer.h" + +#include "ir/base/scriptFunction.h" +#include "util/helpers.h" namespace panda::es2panda::checker { void ETSChecker::InitializeBuiltins(binder::ETSBinder *binder) diff --git a/checker/ETSchecker.h b/checker/ETSchecker.h index 191e17faf34e280b72d02f06b42c0b7be51db1b8..998d03fbf22c7cab30f66d23fcb68aa3d25965af 100644 --- a/checker/ETSchecker.h +++ b/checker/ETSchecker.h @@ -16,19 +16,19 @@ #ifndef ES2PANDA_CHECKER_ETS_CHECKER_H #define ES2PANDA_CHECKER_ETS_CHECKER_H -#include "plugins/ecmascript/es2panda/checker/checkerContext.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" -#include "plugins/ecmascript/es2panda/binder/enumMemberResult.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeConverter.h" -#include "plugins/ecmascript/es2panda/checker/ets/primitiveWrappers.h" -#include "plugins/ecmascript/es2panda/checker/types/globalTypesHolder.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" +#include "checker/checkerContext.h" +#include "checker/types/ets/etsObjectType.h" +#include "checker/checker.h" +#include "binder/enumMemberResult.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "util/enumbitops.h" +#include "util/ustring.h" +#include "checker/types/ets/types.h" +#include "checker/ets/typeConverter.h" +#include "checker/ets/primitiveWrappers.h" +#include "checker/types/globalTypesHolder.h" +#include "binder/scope.h" #include "macros.h" diff --git a/checker/JSchecker.cpp b/checker/JSchecker.cpp index b591fcb2597df174ccc527d94e049b0755890ae6..6e2bd624ba73655251e5e54cdac8eabc42cd4094 100644 --- a/checker/JSchecker.cpp +++ b/checker/JSchecker.cpp @@ -15,8 +15,8 @@ #include "JSchecker.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" +#include "binder/binder.h" +#include "parser/program/program.h" namespace panda::es2panda::checker { diff --git a/checker/JSchecker.h b/checker/JSchecker.h index 6b1eefe770b585551a3287816a8a5e04d9b3a6e0..604737be7209b4be4872f8da7ea1be971cb7a807 100644 --- a/checker/JSchecker.h +++ b/checker/JSchecker.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_CHECKER_JS_CHECKER_H #define ES2PANDA_CHECKER_JS_CHECKER_H -#include "plugins/ecmascript/es2panda/checker/checker.h" +#include "checker/checker.h" namespace panda::es2panda::checker { diff --git a/checker/TSchecker.cpp b/checker/TSchecker.cpp index ead1bf272bed1b03a6b8c4ef8601ba3910fc8eac..f4b2d6c8b9c1c10d6af3f497af96415824340c9c 100644 --- a/checker/TSchecker.cpp +++ b/checker/TSchecker.cpp @@ -15,8 +15,8 @@ #include "TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" +#include "ir/statements/blockStatement.h" +#include "parser/program/program.h" namespace panda::es2panda::checker { diff --git a/checker/TSchecker.h b/checker/TSchecker.h index 101b6c0ed2cc04fc6fed2336c46b0a5744cc848c..e3819833f856ca148d1609ae42802617aeaccb35 100644 --- a/checker/TSchecker.h +++ b/checker/TSchecker.h @@ -16,12 +16,12 @@ #ifndef ES2PANDA_CHECKER_TS_CHECKER_H #define ES2PANDA_CHECKER_TS_CHECKER_H -#include "plugins/ecmascript/es2panda/checker/checker.h" -#include "plugins/ecmascript/es2panda/binder/enumMemberResult.h" -#include "plugins/ecmascript/es2panda/checker/types/globalTypesHolder.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/types.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "checker/checker.h" +#include "binder/enumMemberResult.h" +#include "checker/types/globalTypesHolder.h" +#include "checker/types/ts/types.h" +#include "util/enumbitops.h" +#include "util/ustring.h" #include "macros.h" #include diff --git a/checker/checker.cpp b/checker/checker.cpp index 5233e88b021b251e967acf4e02d807035601fe71..81e0b2b32ebc453a215a7ee9124ade558bd78841 100644 --- a/checker/checker.cpp +++ b/checker/checker.cpp @@ -15,18 +15,18 @@ #include "checker.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/checker/types/globalTypesHolder.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/unionType.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "checker/types/type.h" +#include "ir/expression.h" +#include "ir/statements/blockStatement.h" +#include "parser/program/program.h" +#include "util/helpers.h" +#include "binder/binder.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "es2panda.h" +#include "checker/types/globalTypesHolder.h" +#include "checker/types/ts/unionType.h" +#include "checker/types/signature.h" #include #include diff --git a/checker/checker.h b/checker/checker.h index 6ddc33e2017da3b293792288baae8015be98f7b5..7d9536bdc30ae61f12e10cd449a03935acd1b58f 100644 --- a/checker/checker.h +++ b/checker/checker.h @@ -16,12 +16,12 @@ #ifndef ES2PANDA_CHECKER_CHECKER_H #define ES2PANDA_CHECKER_CHECKER_H -#include "plugins/ecmascript/es2panda/binder/enumMemberResult.h" -#include "plugins/ecmascript/es2panda/checker/checkerContext.h" -#include "plugins/ecmascript/es2panda/checker/types/typeRelation.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/es2panda.h" +#include "binder/enumMemberResult.h" +#include "checker/checkerContext.h" +#include "checker/types/typeRelation.h" +#include "util/enumbitops.h" +#include "util/ustring.h" +#include "es2panda.h" #include "macros.h" #include diff --git a/checker/checkerContext.h b/checker/checkerContext.h index dd28a1937a0edf0608752c07341395335b70320e..cae163ce7716b8238a4e7fa79258a54065dedefc 100644 --- a/checker/checkerContext.h +++ b/checker/checkerContext.h @@ -17,8 +17,8 @@ #define ES2PANDA_CHECKER_CHECKER_CONTEXT_H #include -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "binder/variable.h" +#include "util/enumbitops.h" #include diff --git a/checker/ets/aliveAnalyzer.cpp b/checker/ets/aliveAnalyzer.cpp index 2a0b51da2b1614a749ae5216b4d24252f9f106cb..07e4d13481914a92857f5229a25545f966d9fc28 100644 --- a/checker/ets/aliveAnalyzer.cpp +++ b/checker/ets/aliveAnalyzer.cpp @@ -16,38 +16,38 @@ #include "aliveAnalyzer.h" #include -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/doWhileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/expressionStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/whileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/forUpdateStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/labelledStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/forOfStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/ifStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/throwStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchCaseStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/breakStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/continueStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/tryStatement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewClassInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsStructDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/base/catchClause.h" +#include "ir/base/classDefinition.h" +#include "ir/base/classProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/variableDeclaration.h" +#include "ir/statements/doWhileStatement.h" +#include "ir/statements/expressionStatement.h" +#include "ir/statements/whileStatement.h" +#include "ir/statements/forUpdateStatement.h" +#include "ir/statements/labelledStatement.h" +#include "ir/statements/forOfStatement.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/ifStatement.h" +#include "ir/statements/switchStatement.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/throwStatement.h" +#include "ir/statements/switchCaseStatement.h" +#include "ir/statements/breakStatement.h" +#include "ir/statements/continueStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/statements/tryStatement.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/ets/etsNewClassInstanceExpression.h" +#include "ir/ets/etsStructDeclaration.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "binder/variable.h" +#include "binder/scope.h" +#include "binder/declaration.h" +#include "checker/ETSchecker.h" +#include "ir/base/catchClause.h" namespace panda::es2panda::checker { diff --git a/checker/ets/aliveAnalyzer.h b/checker/ets/aliveAnalyzer.h index 79bfde80a16daf602d317179c13cb0a32e52d58d..948b0472e3fb03d82d75603941df186655d51055 100644 --- a/checker/ets/aliveAnalyzer.h +++ b/checker/ets/aliveAnalyzer.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_ALIVE_ANALYZER_H #define ES2PANDA_COMPILER_CHECKER_ETS_ALIVE_ANALYZER_H -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/baseAnalyzer.h" +#include "checker/ETSchecker.h" +#include "checker/ets/baseAnalyzer.h" #include "utils/arena_containers.h" diff --git a/checker/ets/arithmetic.cpp b/checker/ets/arithmetic.cpp index 428ea3dee43100b488ca129fb22ed9b15364406d..0061adabb5f61a191be00e3b41c202624bed52a4 100644 --- a/checker/ets/arithmetic.cpp +++ b/checker/ets/arithmetic.cpp @@ -15,11 +15,11 @@ #include "arithmetic.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "ir/expressions/identifier.h" +#include "binder/variable.h" +#include "binder/scope.h" +#include "binder/declaration.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::checker { diff --git a/checker/ets/arithmetic.h b/checker/ets/arithmetic.h index 10261b69bf6ed85f00c5615261e6828adeecfac1..cd5e720afde351e53179787f498e401ccc287aca 100644 --- a/checker/ets/arithmetic.h +++ b/checker/ets/arithmetic.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_ARITHMETIC_H #define ES2PANDA_COMPILER_CHECKER_ETS_ARITHMETIC_H -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsBooleanType.h" +#include "checker/ETSchecker.h" +#include "checker/types/ets/etsBooleanType.h" namespace panda::es2panda::checker { diff --git a/checker/ets/baseAnalyzer.cpp b/checker/ets/baseAnalyzer.cpp index da7926e5b91fcc1072287fd6436b5e173a7fef86..fb05670f566354249acd3b867cd2a0de5ef3303e 100644 --- a/checker/ets/baseAnalyzer.cpp +++ b/checker/ets/baseAnalyzer.cpp @@ -14,9 +14,9 @@ */ #include "baseAnalyzer.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/statements/breakStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/continueStatement.h" +#include "ir/astNode.h" +#include "ir/statements/breakStatement.h" +#include "ir/statements/continueStatement.h" namespace panda::es2panda::checker { void BaseAnalyzer::ClearPendingExits() diff --git a/checker/ets/baseAnalyzer.h b/checker/ets/baseAnalyzer.h index b53dbb94030dfd746402d9b37713f9f00565b7ab..bcee5fc399fc2ae390f04a543e793b5d47eda574 100644 --- a/checker/ets/baseAnalyzer.h +++ b/checker/ets/baseAnalyzer.h @@ -17,7 +17,7 @@ #define ES2PANDA_COMPILER_CHECKER_ETS_BASE_ANALYZER_H #include "utils/arena_containers.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "util/enumbitops.h" namespace panda::es2panda::ir { class AstNode; diff --git a/checker/ets/boxingConverter.cpp b/checker/ets/boxingConverter.cpp index d5fc3b34df351accf9cd3e2f52e808b2d30380ae..f65512001c0af80b72f71e57d1f7de0cedcfcf03 100644 --- a/checker/ets/boxingConverter.cpp +++ b/checker/ets/boxingConverter.cpp @@ -14,10 +14,10 @@ */ #include "boxingConverter.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/checker/ets/primitiveWrappers.h" +#include "checker/types/ets/types.h" +#include "checker/ETSchecker.h" +#include "util/helpers.h" +#include "checker/ets/primitiveWrappers.h" namespace panda::es2panda::checker { diff --git a/checker/ets/boxingConverter.h b/checker/ets/boxingConverter.h index 3b076bc2f2433d3d064a41627e6d6648240c80b6..ecd0dd0042a35b3f0a4f7ab86db1abce31cc5ace 100644 --- a/checker/ets/boxingConverter.h +++ b/checker/ets/boxingConverter.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_BOXING_CONVERTER_H #define ES2PANDA_COMPILER_CHECKER_ETS_BOXING_CONVERTER_H -#include "plugins/ecmascript/es2panda/checker/ets/typeConverter.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" +#include "checker/ets/typeConverter.h" +#include "checker/types/ets/etsObjectType.h" namespace panda::es2panda::checker { class BoxingConverter : public TypeConverter { diff --git a/checker/ets/castingContext.h b/checker/ets/castingContext.h index a0d888040fece7eb239cee9f74065030454eb617..527ff8a22538dab670b8a9607c87c3cb41fdf120 100644 --- a/checker/ets/castingContext.h +++ b/checker/ets/castingContext.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_CASTING_CONTEXT_H #define ES2PANDA_COMPILER_CHECKER_ETS_CASTING_CONTEXT_H -#include "plugins/ecmascript/es2panda/checker/types/typeRelation.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "checker/types/typeRelation.h" +#include "ir/expression.h" namespace panda::es2panda::checker { class CastingContext { diff --git a/checker/ets/conversion.cpp b/checker/ets/conversion.cpp index 7163a18d2ad7bd4cc22648b2125969273b3e71d7..4804f788b36dc9d362103e01d8b487e93491e7ec 100644 --- a/checker/ets/conversion.cpp +++ b/checker/ets/conversion.cpp @@ -15,10 +15,10 @@ #include "conversion.h" -#include "plugins/ecmascript/es2panda/checker/ets/boxingConverter.h" -#include "plugins/ecmascript/es2panda/checker/ets/narrowingConverter.h" -#include "plugins/ecmascript/es2panda/checker/ets/unboxingConverter.h" -#include "plugins/ecmascript/es2panda/checker/ets/wideningConverter.h" +#include "checker/ets/boxingConverter.h" +#include "checker/ets/narrowingConverter.h" +#include "checker/ets/unboxingConverter.h" +#include "checker/ets/wideningConverter.h" namespace panda::es2panda::checker::conversion { void Identity(TypeRelation *const relation, Type *const source, Type *const target) diff --git a/checker/ets/conversion.h b/checker/ets/conversion.h index 673245232b83c4b7f8043e10fa97a27a523fb79d..af4fb8bf0ec3b06105e6ddeecf68219d8416860d 100644 --- a/checker/ets/conversion.h +++ b/checker/ets/conversion.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_CONVERSION_H #define ES2PANDA_COMPILER_CHECKER_ETS_CONVERSION_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/checker/types/typeRelation.h" +#include "checker/types/type.h" +#include "checker/types/typeRelation.h" namespace panda::es2panda::checker::conversion { void Identity(TypeRelation *relation, Type *source, Type *target); diff --git a/checker/ets/dynamic.cpp b/checker/ets/dynamic.cpp index 82738a3f5a099eabbad27018ae7f632ac625c967..7dfc0a25b61ae0bd56d9d7a478590c3253084ceb 100644 --- a/checker/ets/dynamic.cpp +++ b/checker/ets/dynamic.cpp @@ -13,36 +13,36 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" - -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsDynamicFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/classStaticBlock.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/thisExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsPrimitiveType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsAsExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/expressionStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/util/language.h" +#include "checker/ETSchecker.h" + +#include "binder/scope.h" +#include "binder/declaration.h" +#include "binder/binder.h" +#include "binder/ETSBinder.h" +#include "checker/types/ets/etsDynamicFunctionType.h" +#include "ir/base/classProperty.h" +#include "ir/base/classStaticBlock.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/thisExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/ets/etsPrimitiveType.h" +#include "ir/ts/tsAsExpression.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/expressionStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/statements/variableDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "parser/program/program.h" +#include "util/helpers.h" +#include "util/language.h" #include "generated/signatures.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsParameterExpression.h" +#include "ir/ets/etsParameterExpression.h" namespace panda::es2panda::checker { diff --git a/checker/ets/enum.cpp b/checker/ets/enum.cpp index cf09ba105f583245058a14eb7895e67efaa832b8..749ae53ac131ea313e2775f64da3773443b3a704 100644 --- a/checker/ets/enum.cpp +++ b/checker/ets/enum.cpp @@ -13,38 +13,38 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewClassInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsPrimitiveType.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/updateExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/forUpdateStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/ifStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/throwStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsArrayType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsAsExpression.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsParameterExpression.h" +#include "binder/ETSBinder.h" +#include "binder/variable.h" +#include "checker/ETSchecker.h" +#include "ir/base/classProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/property.h" +#include "ir/base/scriptFunction.h" +#include "ir/ets/etsNewClassInstanceExpression.h" +#include "ir/ets/etsPrimitiveType.h" +#include "ir/ets/etsTypeReference.h" +#include "ir/ets/etsTypeReferencePart.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/updateExpression.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/forUpdateStatement.h" +#include "ir/statements/ifStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/statements/throwStatement.h" +#include "ir/statements/variableDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/ts/tsArrayType.h" +#include "ir/ts/tsAsExpression.h" +#include "ir/ts/tsEnumMember.h" +#include "ir/ts/tsInterfaceBody.h" +#include "parser/program/program.h" +#include "ir/ets/etsParameterExpression.h" namespace panda::es2panda::checker { diff --git a/checker/ets/function.cpp b/checker/ets/function.cpp index 94eff9f94dda23ef3c0ef7370d35409614e547e0..06270c4e93e2627c3546886bfaff7a2064ed5337 100644 --- a/checker/ets/function.cpp +++ b/checker/ets/function.cpp @@ -13,49 +13,49 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsAsyncFuncReturnType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/checker/types/typeFlag.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsParameterExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrowFunctionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/thisExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/expressionStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsArrayType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/util/language.h" +#include "binder/binder.h" +#include "binder/declaration.h" +#include "binder/ETSBinder.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "binder/variableFlags.h" +#include "checker/ETSchecker.h" +#include "checker/ets/typeRelationContext.h" +#include "checker/types/ets/etsAsyncFuncReturnType.h" +#include "checker/types/ets/etsObjectType.h" +#include "checker/types/type.h" +#include "checker/types/typeFlag.h" +#include "ir/astNode.h" +#include "ir/typeNode.h" +#include "ir/base/classDefinition.h" +#include "ir/base/classProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/spreadElement.h" +#include "ir/ets/etsFunctionType.h" +#include "ir/ets/etsParameterExpression.h" +#include "ir/ets/etsTypeReference.h" +#include "ir/ets/etsTypeReferencePart.h" +#include "ir/expressions/arrowFunctionExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/thisExpression.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/expressionStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/ts/tsArrayType.h" +#include "ir/ts/tsInterfaceBody.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "parser/program/program.h" +#include "util/helpers.h" +#include "util/language.h" namespace panda::es2panda::checker { diff --git a/checker/ets/helpers.cpp b/checker/ets/helpers.cpp index 461380b66b380dbe49fd2183f70f2336b313b220..5302988b7e1041105d710f43b2707035f14d6614 100644 --- a/checker/ets/helpers.cpp +++ b/checker/ets/helpers.cpp @@ -13,59 +13,59 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" -#include "plugins/ecmascript/es2panda/checker/checkerContext.h" -#include "plugins/ecmascript/es2panda/checker/ets/narrowingWideningConverter.h" -#include "plugins/ecmascript/es2panda/checker/types/globalTypesHolder.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" -#include "plugins/ecmascript/es2panda/ir/base/catchClause.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchCaseStatement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/booleanLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/charLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrowFunctionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/nullLiteral.h" -#include "plugins/ecmascript/es2panda/ir/statements/labelledStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/tryStatement.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewClassInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsParameterExpression.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsPrimitiveType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" -#include "plugins/ecmascript/es2panda/checker/ets/boxingConverter.h" -#include "plugins/ecmascript/es2panda/checker/ets/unboxingConverter.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "binder/variableFlags.h" +#include "checker/checker.h" +#include "checker/checkerContext.h" +#include "checker/ets/narrowingWideningConverter.h" +#include "checker/types/globalTypesHolder.h" +#include "checker/types/ets/etsObjectType.h" +#include "ir/astNode.h" +#include "lexer/token/tokenType.h" +#include "ir/base/catchClause.h" +#include "ir/expression.h" +#include "ir/typeNode.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/classProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/switchCaseStatement.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/literals/booleanLiteral.h" +#include "ir/expressions/literals/charLiteral.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/arrowFunctionExpression.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/nullLiteral.h" +#include "ir/statements/labelledStatement.h" +#include "ir/statements/tryStatement.h" +#include "ir/ets/etsFunctionType.h" +#include "ir/ets/etsNewClassInstanceExpression.h" +#include "ir/ets/etsParameterExpression.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "ir/ts/tsEnumMember.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ets/etsTypeReference.h" +#include "ir/ets/etsTypeReferencePart.h" +#include "ir/ets/etsPrimitiveType.h" +#include "ir/ts/tsQualifiedName.h" +#include "binder/variable.h" +#include "binder/scope.h" +#include "binder/declaration.h" +#include "parser/program/program.h" +#include "checker/ETSchecker.h" +#include "binder/ETSBinder.h" +#include "checker/ets/typeRelationContext.h" +#include "checker/ets/boxingConverter.h" +#include "checker/ets/unboxingConverter.h" +#include "checker/types/ets/types.h" +#include "util/helpers.h" namespace panda::es2panda::checker { void ETSChecker::CheckTruthinessOfType(ir::Expression *expr) diff --git a/checker/ets/narrowingConverter.h b/checker/ets/narrowingConverter.h index 313525954195413b64834ccdedb212f497e5657a..baadfa9f3fc59c762ebfda0f0b3c993612e7b3e9 100644 --- a/checker/ets/narrowingConverter.h +++ b/checker/ets/narrowingConverter.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_NARROWING_CONVERTER_H #define ES2PANDA_COMPILER_CHECKER_ETS_NARROWING_CONVERTER_H -#include "plugins/ecmascript/es2panda/checker/ets/typeConverter.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "checker/ets/typeConverter.h" +#include "checker/ETSchecker.h" +#include "util/helpers.h" namespace panda::es2panda::checker { class NarrowingConverter : public TypeConverter { diff --git a/checker/ets/narrowingWideningConverter.h b/checker/ets/narrowingWideningConverter.h index a20960981f64dbcecd1af0c44dc0c282849e7210..05b3134078d6e1b363c9b2b7543ea95634352f70 100644 --- a/checker/ets/narrowingWideningConverter.h +++ b/checker/ets/narrowingWideningConverter.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_NARROWING_WIDENING_CONVERTER_H #define ES2PANDA_COMPILER_CHECKER_ETS_NARROWING_WIDENING_CONVERTER_H -#include "plugins/ecmascript/es2panda/checker/ets/narrowingConverter.h" -#include "plugins/ecmascript/es2panda/checker/ets/wideningConverter.h" +#include "checker/ets/narrowingConverter.h" +#include "checker/ets/wideningConverter.h" namespace panda::es2panda::checker { class NarrowingWideningConverter : public NarrowingConverter { diff --git a/checker/ets/object.cpp b/checker/ets/object.cpp index 3293e7028cd2467138d57abd98b125cacb086916..442a556b769edd520eb2b89722252b1409de4cfd 100644 --- a/checker/ets/object.cpp +++ b/checker/ets/object.cpp @@ -13,47 +13,47 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classElement.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classStaticBlock.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/expressionStatement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/superExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/thisExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsClassImplements.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceHeritage.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewClassInstanceExpression.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/typeFlag.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsDynamicType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" +#include "binder/variableFlags.h" +#include "checker/types/ets/etsObjectType.h" +#include "ir/astNode.h" +#include "ir/typeNode.h" +#include "ir/base/classDefinition.h" +#include "ir/base/classElement.h" +#include "ir/base/classProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/classStaticBlock.h" +#include "ir/base/scriptFunction.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/expressionStatement.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/superExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/thisExpression.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/returnStatement.h" +#include "ir/ts/tsClassImplements.h" +#include "ir/ts/tsInterfaceHeritage.h" +#include "ir/ts/tsInterfaceBody.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ets/etsTypeReference.h" +#include "ir/ets/etsTypeReferencePart.h" +#include "ir/ets/etsNewClassInstanceExpression.h" +#include "binder/variable.h" +#include "binder/scope.h" +#include "binder/declaration.h" +#include "binder/ETSBinder.h" +#include "checker/ETSchecker.h" +#include "checker/types/typeFlag.h" +#include "checker/types/ets/etsDynamicType.h" +#include "checker/types/ets/types.h" +#include "checker/ets/typeRelationContext.h" namespace panda::es2panda::checker { ETSObjectType *ETSChecker::GetSuperType(ETSObjectType *type) diff --git a/checker/ets/primitiveWrappers.h b/checker/ets/primitiveWrappers.h index 675930d18e6b32d5b187a243bfcc3cbe5cd3b750..1bfcd41ee462a4f8b767bf0f671e7397ca2922cb 100644 --- a/checker/ets/primitiveWrappers.h +++ b/checker/ets/primitiveWrappers.h @@ -17,7 +17,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_PRIMITIVE_WRAPPERS_H #define ES2PANDA_COMPILER_CHECKER_ETS_PRIMITIVE_WRAPPERS_H -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" +#include "checker/types/ets/etsObjectType.h" namespace panda::es2panda::checker { class ETSObjectType; diff --git a/checker/ets/typeConverter.h b/checker/ets/typeConverter.h index 6f90280a9023f986d7b3ef783d873040ae312a6c..2c750ae2ddc3346e87f8b6041b4f9e38b1c060cb 100644 --- a/checker/ets/typeConverter.h +++ b/checker/ets/typeConverter.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_TYPE_CONVERTER_H #define ES2PANDA_COMPILER_CHECKER_ETS_TYPE_CONVERTER_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class ETSChecker; diff --git a/checker/ets/typeCreation.cpp b/checker/ets/typeCreation.cpp index 157e18ce2e8e8d2189a70de8f0948cf9478c6c66..3119eb7d04b10479ccb72db6d406577c88ff68c5 100644 --- a/checker/ets/typeCreation.cpp +++ b/checker/ets/typeCreation.cpp @@ -14,19 +14,19 @@ */ #include "generated/signatures.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsDynamicFunctionType.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsScript.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "checker/ETSchecker.h" +#include "checker/types/ets/etsDynamicFunctionType.h" +#include "binder/binder.h" +#include "binder/ETSBinder.h" +#include "ir/ets/etsScript.h" +#include "ir/base/classDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsEnumMember.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "parser/program/program.h" +#include "util/helpers.h" namespace panda::es2panda::checker { ByteType *ETSChecker::CreateByteType(int8_t value) diff --git a/checker/ets/typeRelationContext.cpp b/checker/ets/typeRelationContext.cpp index 30b99566e0d2a7504d1178ed400da81de0d3f49c..8ba09ba64645597e2665275b0d1bb908613cbe8d 100644 --- a/checker/ets/typeRelationContext.cpp +++ b/checker/ets/typeRelationContext.cpp @@ -14,13 +14,13 @@ */ #include "typeRelationContext.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsArrayType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" +#include "binder/variable.h" +#include "binder/scope.h" +#include "binder/declaration.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsArrayType.h" +#include "ir/ts/tsTypeParameter.h" namespace panda::es2panda::checker { void AssignmentContext::ValidateArrayTypeInitializerByElement(TypeRelation *relation, ir::ArrayExpression *node, diff --git a/checker/ets/typeRelationContext.h b/checker/ets/typeRelationContext.h index 1df627ac8fbc0b3bc3215455cc0026450e720408..8c8db5d9b02e878fc32b89df19df98729bc84175 100644 --- a/checker/ets/typeRelationContext.h +++ b/checker/ets/typeRelationContext.h @@ -16,13 +16,13 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_TYPE_RELATION_CONTEXT_H #define ES2PANDA_COMPILER_CHECKER_ETS_TYPE_RELATION_CONTEXT_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "ir/expression.h" +#include "ir/base/classDefinition.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "checker/types/type.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::checker { class ETSChecker; diff --git a/checker/ets/unboxingConverter.cpp b/checker/ets/unboxingConverter.cpp index 68d37f28325033e9f28b7903d4be09b16a176622..3ab5b7bf5bcf341432c0e2c51e29a102f12fe7c2 100644 --- a/checker/ets/unboxingConverter.cpp +++ b/checker/ets/unboxingConverter.cpp @@ -14,9 +14,9 @@ */ #include "unboxingConverter.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "checker/types/ets/types.h" +#include "checker/ETSchecker.h" +#include "util/helpers.h" namespace panda::es2panda::checker { diff --git a/checker/ets/unboxingConverter.h b/checker/ets/unboxingConverter.h index 8832ab75ceb75807a3a50bb7429787e54cf351ed..da5c365a4eaad337df7f673084b3a55701936298 100644 --- a/checker/ets/unboxingConverter.h +++ b/checker/ets/unboxingConverter.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_UNBOXING_CONVERTER_H #define ES2PANDA_COMPILER_CHECKER_ETS_UNBOXING_CONVERTER_H -#include "plugins/ecmascript/es2panda/checker/ets/typeConverter.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" +#include "checker/ets/typeConverter.h" +#include "checker/types/ets/etsObjectType.h" namespace panda::es2panda::checker { diff --git a/checker/ets/wideningConverter.h b/checker/ets/wideningConverter.h index 0bfe71d462cd9e62fb47ee11a5a29a9eff0c6046..1121deb80a396fcc5d289b8d419bc17c27e6ef35 100644 --- a/checker/ets/wideningConverter.h +++ b/checker/ets/wideningConverter.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_ETS_WIDENING_CONVERTER_H #define ES2PANDA_COMPILER_CHECKER_ETS_WIDENING_CONVERTER_H -#include "plugins/ecmascript/es2panda/checker/ets/typeConverter.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "checker/ets/typeConverter.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::checker { diff --git a/checker/ts/binaryLikeExpression.cpp b/checker/ts/binaryLikeExpression.cpp index 42dc9bdf3ea216311e14583ba0fe8d0651dc1276..e37138b45ff810c18011a3b584574fbf0ff2a540 100644 --- a/checker/ts/binaryLikeExpression.cpp +++ b/checker/ts/binaryLikeExpression.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "checker/TSchecker.h" namespace panda::es2panda::checker { Type *TSChecker::CheckBinaryOperator(Type *left_type, Type *right_type, ir::Expression *left_expr, diff --git a/checker/ts/destructuringContext.cpp b/checker/ts/destructuringContext.cpp index 51c2a3f13fc1208b7592c67d7eec8001f9891f9f..2dfb91928b05958d7dbdcdc7161b00e9a1a63b41 100644 --- a/checker/ts/destructuringContext.cpp +++ b/checker/ts/destructuringContext.cpp @@ -15,16 +15,16 @@ #include "destructuringContext.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "util/helpers.h" +#include "binder/scope.h" +#include "ir/typeNode.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/base/spreadElement.h" +#include "ir/base/property.h" +#include "ir/expression.h" namespace panda::es2panda::checker { void DestructuringContext::Prepare(ir::TypeNode *type_annotation, ir::Expression *initializer, diff --git a/checker/ts/destructuringContext.h b/checker/ts/destructuringContext.h index f6d45b6de76f53e6c8cdf67206951dda443f5a5b..88d52d8d0c16deead617c529a24b8ca40d053849 100644 --- a/checker/ts/destructuringContext.h +++ b/checker/ts/destructuringContext.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_CHECKER_TS_DESTRUCTURING_CONTEXT_H #define ES2PANDA_CHECKER_TS_DESTRUCTURING_CONTEXT_H -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "checker/TSchecker.h" +#include "ir/expression.h" #include diff --git a/checker/ts/function.cpp b/checker/ts/function.cpp index b29a2479b8e435251badff67af3affd04932da45..73d5040c8722696fe94264cc3a01dc403c0e9f35 100644 --- a/checker/ts/function.cpp +++ b/checker/ts/function.cpp @@ -13,30 +13,30 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/bigIntLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/functionDeclaration.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" - -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ts/destructuringContext.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/objectDescriptor.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/objectType.h" +#include "ir/typeNode.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/literals/bigIntLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/property.h" +#include "ir/base/spreadElement.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/statements/functionDeclaration.h" +#include "util/helpers.h" +#include "binder/variable.h" +#include "binder/scope.h" +#include "binder/declaration.h" + +#include "checker/TSchecker.h" +#include "checker/ts/destructuringContext.h" +#include "checker/types/ts/objectDescriptor.h" +#include "checker/types/ts/objectType.h" #include #include diff --git a/checker/ts/helpers.cpp b/checker/ts/helpers.cpp index 95fdf2a9f6ba21571c1ff434419d61c7466ca822..41ab10bc3fe633fd80ec155b24df57dfef918838 100644 --- a/checker/ts/helpers.cpp +++ b/checker/ts/helpers.cpp @@ -13,25 +13,25 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/ir/base/tsPropertySignature.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" - -#include "plugins/ecmascript/es2panda/checker/ts/typeElaborationContext.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/typeNode.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/ts/tsQualifiedName.h" +#include "ir/base/tsPropertySignature.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "ir/ts/tsTypeReference.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ts/tsTypeParameter.h" +#include "binder/variable.h" +#include "binder/scope.h" +#include "util/helpers.h" + +#include "checker/ts/typeElaborationContext.h" +#include "checker/TSchecker.h" namespace panda::es2panda::checker { void TSChecker::CheckTruthinessOfType(Type *type, lexer::SourcePosition line_info) diff --git a/checker/ts/object.cpp b/checker/ts/object.cpp index a01d543251a2f81f46a8f8e0e53a99838981e2f6..c8f40f77004990e504f10b585b0767c4d87bec8a 100644 --- a/checker/ts/object.cpp +++ b/checker/ts/object.cpp @@ -13,29 +13,29 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/ir/expressions/literals/bigIntLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/tsIndexSignature.h" -#include "plugins/ecmascript/es2panda/ir/base/tsMethodSignature.h" -#include "plugins/ecmascript/es2panda/ir/base/tsPropertySignature.h" -#include "plugins/ecmascript/es2panda/ir/base/tsSignatureDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeLiteral.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceHeritage.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" - -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/indexInfo.h" +#include "ir/expressions/literals/bigIntLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/base/property.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/spreadElement.h" +#include "ir/base/tsIndexSignature.h" +#include "ir/base/tsMethodSignature.h" +#include "ir/base/tsPropertySignature.h" +#include "ir/base/tsSignatureDeclaration.h" +#include "ir/ts/tsTypeLiteral.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsInterfaceHeritage.h" +#include "ir/ts/tsInterfaceBody.h" +#include "util/helpers.h" +#include "binder/variable.h" +#include "binder/scope.h" + +#include "checker/TSchecker.h" +#include "checker/types/ts/indexInfo.h" namespace panda::es2panda::checker { void TSChecker::CheckIndexConstraints(Type *type) diff --git a/checker/ts/typeCreation.cpp b/checker/ts/typeCreation.cpp index 7fd48c08e3692220f4ec37fda2750796eaaa0bd7..06121bdc76418e2817ee85f575e6892ec164cd25 100644 --- a/checker/ts/typeCreation.cpp +++ b/checker/ts/typeCreation.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/indexInfo.h" +#include "checker/TSchecker.h" +#include "checker/types/ts/indexInfo.h" namespace panda::es2panda::checker { Type *TSChecker::CreateNumberLiteralType(double value) diff --git a/checker/ts/typeElaborationContext.cpp b/checker/ts/typeElaborationContext.cpp index a11e6b64ec575c8ed2bafda668e41c12a017a040..e7fc27ef12db870c24ac46e679b2c8611e63cab6 100644 --- a/checker/ts/typeElaborationContext.cpp +++ b/checker/ts/typeElaborationContext.cpp @@ -15,15 +15,15 @@ #include "typeElaborationContext.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" +#include "util/helpers.h" +#include "binder/scope.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/base/spreadElement.h" +#include "ir/base/property.h" namespace panda::es2panda::checker { Type *ElaborationContext::GetBestMatchingType(Type *index_type, ir::Expression *source_node) diff --git a/checker/ts/typeElaborationContext.h b/checker/ts/typeElaborationContext.h index 6042481e0b178094efae785fc514007624c9f8e8..3fab23a7e688ecad1114c524d96bbcc28cb12d24 100644 --- a/checker/ts/typeElaborationContext.h +++ b/checker/ts/typeElaborationContext.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_CHECKER_TS_TYPE_ELABORATION_CONTEXT_H #define ES2PANDA_CHECKER_TS_TYPE_ELABORATION_CONTEXT_H -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "checker/TSchecker.h" +#include "ir/expression.h" #include diff --git a/checker/ts/util.cpp b/checker/ts/util.cpp index 98aec8d8d2ebb0c34982a8501657bc672e747cbc..9ffddd75b713605410f31c0c42ab60a15eb09cc4 100644 --- a/checker/ts/util.cpp +++ b/checker/ts/util.cpp @@ -13,13 +13,13 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/templateLiteral.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/templateLiteral.h" +#include "ir/ts/tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "checker/TSchecker.h" namespace panda::es2panda::checker { ir::MemberExpression *TSChecker::ResolveLeftMostMemberExpression(ir::MemberExpression *expr) diff --git a/checker/types/ets/byteType.cpp b/checker/types/ets/byteType.cpp index 55044159c1f12702c97c715931004abeef869e62..5c05455108965532d6f2c915fac5811e362b543a 100644 --- a/checker/types/ets/byteType.cpp +++ b/checker/types/ets/byteType.cpp @@ -15,8 +15,8 @@ #include "byteType.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/checker/ets/narrowingConverter.h" +#include "checker/ets/conversion.h" +#include "checker/ets/narrowingConverter.h" namespace panda::es2panda::checker { void ByteType::Identical(TypeRelation *relation, Type *other) diff --git a/checker/types/ets/byteType.h b/checker/types/ets/byteType.h index dd107b1221871da4aa70717844950d46e2071d19..ecbf47d8850307a8d1fd941769787baae269fdca 100644 --- a/checker/types/ets/byteType.h +++ b/checker/types/ets/byteType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_BYTE_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_BYTE_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class ByteType : public Type { diff --git a/checker/types/ets/charType.cpp b/checker/types/ets/charType.cpp index 2a523aff7a73f1a240d7e7686e91f6ddc103836e..aba253d3397dea3f635ecd99b118f12310192977 100644 --- a/checker/types/ets/charType.cpp +++ b/checker/types/ets/charType.cpp @@ -15,8 +15,8 @@ #include "charType.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/checker/ets/narrowingConverter.h" +#include "checker/ets/conversion.h" +#include "checker/ets/narrowingConverter.h" namespace panda::es2panda::checker { void CharType::Identical(TypeRelation *relation, Type *other) diff --git a/checker/types/ets/charType.h b/checker/types/ets/charType.h index 4e7cf18c443c7d94f91a32e1bee5e95b5ffe8962..6f7dc11b828ee2b971499876bb838aa3063b6a8b 100644 --- a/checker/types/ets/charType.h +++ b/checker/types/ets/charType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_CHAR_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_CHAR_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class CharType : public Type { diff --git a/checker/types/ets/doubleType.cpp b/checker/types/ets/doubleType.cpp index 4464e715531c9b111de5ca5da147048181604e1f..99e3d5e0d11c66b58e56619e1820c31a31191b57 100644 --- a/checker/types/ets/doubleType.cpp +++ b/checker/types/ets/doubleType.cpp @@ -15,8 +15,8 @@ #include "doubleType.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/checker/ets/wideningConverter.h" +#include "checker/ets/conversion.h" +#include "checker/ets/wideningConverter.h" namespace panda::es2panda::checker { void DoubleType::Identical(TypeRelation *relation, Type *other) diff --git a/checker/types/ets/doubleType.h b/checker/types/ets/doubleType.h index 61731f3d8f35ae5346d7803e24e898319f325221..07365fa67043ffd611697251a14b99b0e3fb2d9a 100644 --- a/checker/types/ets/doubleType.h +++ b/checker/types/ets/doubleType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_DOUBLE_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_DOUBLE_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class DoubleType : public Type { diff --git a/checker/types/ets/etsArrayType.cpp b/checker/types/ets/etsArrayType.cpp index fcf73776a3c205b6e4b0539ddadfa1df940d616c..06e49c1bef1f84811ed3e7d06cc2719e6e4fcf56 100644 --- a/checker/types/ets/etsArrayType.cpp +++ b/checker/types/ets/etsArrayType.cpp @@ -15,10 +15,10 @@ #include "etsArrayType.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/checker/types/typeRelation.h" +#include "binder/variable.h" +#include "checker/ETSchecker.h" +#include "checker/ets/conversion.h" +#include "checker/types/typeRelation.h" namespace panda::es2panda::checker { void ETSArrayType::ToString(std::stringstream &ss) const diff --git a/checker/types/ets/etsArrayType.h b/checker/types/ets/etsArrayType.h index 84a789a00bf690025c93ee1934b66060dc9d2f95..323f3df4006d9a62f55d4735c5cc1cd439accf51 100644 --- a/checker/types/ets/etsArrayType.h +++ b/checker/types/ets/etsArrayType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_ARRAY_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_ARRAY_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class ETSArrayType : public Type { diff --git a/checker/types/ets/etsAsyncFuncReturnType.cpp b/checker/types/ets/etsAsyncFuncReturnType.cpp index bba8b07d35a15c572a95bdd22cd586a1c2da3e7d..b0e5545e8c99b4269f3475ac3db403bd995f7ce7 100644 --- a/checker/types/ets/etsAsyncFuncReturnType.cpp +++ b/checker/types/ets/etsAsyncFuncReturnType.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/globalTypesHolder.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsAsyncFuncReturnType.h" +#include "checker/ETSchecker.h" +#include "checker/types/globalTypesHolder.h" +#include "checker/types/ets/etsAsyncFuncReturnType.h" namespace panda::es2panda::checker { void ETSAsyncFuncReturnType::ToString(std::stringstream &ss) const diff --git a/checker/types/ets/etsAsyncFuncReturnType.h b/checker/types/ets/etsAsyncFuncReturnType.h index b1cd7ff8056f48b0c35f353517adf15e30eca39a..bff8035cfb5cb2363916ec47d012398bfeacde08 100644 --- a/checker/types/ets/etsAsyncFuncReturnType.h +++ b/checker/types/ets/etsAsyncFuncReturnType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_ASYNC_FUNC_RETURN_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_ASYNC_FUNC_RETURN_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" +#include "checker/types/ets/etsObjectType.h" namespace panda::es2panda::checker { class GlobalTypesHolder; diff --git a/checker/types/ets/etsBooleanType.cpp b/checker/types/ets/etsBooleanType.cpp index 40723f3945f390263e57de339b764d3d1c7875c4..52dbbfdad44d6ff9bd7664fd628e694dc9998589 100644 --- a/checker/types/ets/etsBooleanType.cpp +++ b/checker/types/ets/etsBooleanType.cpp @@ -15,8 +15,8 @@ #include "etsBooleanType.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" +#include "checker/ETSchecker.h" +#include "checker/ets/conversion.h" namespace panda::es2panda::checker { void ETSBooleanType::Identical(TypeRelation *relation, Type *other) diff --git a/checker/types/ets/etsBooleanType.h b/checker/types/ets/etsBooleanType.h index 6781ee494d5f7564e5ee600e0fbd63162281afbc..f842f762fed55effd52d8be4e1b41c6b0edb1969 100644 --- a/checker/types/ets/etsBooleanType.h +++ b/checker/types/ets/etsBooleanType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_BOOLEAN_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_BOOLEAN_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class ETSBooleanType : public Type { diff --git a/checker/types/ets/etsDynamicFunctionType.h b/checker/types/ets/etsDynamicFunctionType.h index 1b8cfe64cba0b5d97e867c7d3e3a6800ed278aea..06d452b7e3c8a20e169d3b103344176d3b99eac7 100644 --- a/checker/types/ets/etsDynamicFunctionType.h +++ b/checker/types/ets/etsDynamicFunctionType.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_DYNAMIC_FUNCTION_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_DYNAMIC_FUNCTION_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/ets/etsFunctionType.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "checker/types/ets/etsFunctionType.h" +#include "checker/types/signature.h" namespace panda::es2panda::checker { diff --git a/checker/types/ets/etsDynamicType.cpp b/checker/types/ets/etsDynamicType.cpp index 1e8db6f46f07484e62a60dc6e061e98a1d83eaba..7b252e8a03350fe710cb5f7a54f52914fc7bd693 100644 --- a/checker/types/ets/etsDynamicType.cpp +++ b/checker/types/ets/etsDynamicType.cpp @@ -14,8 +14,8 @@ */ #include "etsDynamicType.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsDynamicFunctionType.h" +#include "checker/ETSchecker.h" +#include "checker/types/ets/etsDynamicFunctionType.h" namespace panda::es2panda::checker { diff --git a/checker/types/ets/etsDynamicType.h b/checker/types/ets/etsDynamicType.h index 570846fc234eb438bb1a9ca16eb9e09c2a01c4be..b13e439249fe2ed0d529b60df29fa128ee874d4f 100644 --- a/checker/types/ets/etsDynamicType.h +++ b/checker/types/ets/etsDynamicType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_DYNAMIC_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_DYNAMIC_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" +#include "checker/types/ets/etsObjectType.h" namespace panda::es2panda::checker { class ETSDynamicType : public ETSObjectType { diff --git a/checker/types/ets/etsEnumType.cpp b/checker/types/ets/etsEnumType.cpp index 04f142c486ca58b19d744e3915ee7976abbbfd72..ff1b65ccc7dff8192e8b677a3a718fd433ad670e 100644 --- a/checker/types/ets/etsEnumType.cpp +++ b/checker/types/ets/etsEnumType.cpp @@ -15,12 +15,12 @@ #include "etsEnumType.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" +#include "checker/ETSchecker.h" +#include "checker/ets/conversion.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/memberExpression.h" +#include "ir/ts/tsEnumMember.h" namespace panda::es2panda::checker { ETSEnumType::ETSEnumType(const ir::TSEnumDeclaration *const enum_decl, UType ordinal, diff --git a/checker/types/ets/etsEnumType.h b/checker/types/ets/etsEnumType.h index 4613be52ec2abe4588dc148ce4a45a07fe7666b8..0c2f3a433c433496764802073319d49115a34960 100644 --- a/checker/types/ets/etsEnumType.h +++ b/checker/types/ets/etsEnumType.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_ENUM_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_ENUM_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" +#include "checker/types/type.h" +#include "ir/base/property.h" +#include "ir/ts/tsEnumDeclaration.h" template // NOLINTNEXTLINE(readability-identifier-naming) diff --git a/checker/types/ets/etsFunctionType.cpp b/checker/types/ets/etsFunctionType.cpp index 60061973471037dd00200fa71f4b6bacd916506f..b87aa27c119f948cfefb3648b01ed83b80ccfcdd 100644 --- a/checker/types/ets/etsFunctionType.cpp +++ b/checker/types/ets/etsFunctionType.cpp @@ -14,10 +14,10 @@ */ #include "etsFunctionType.h" -#include "plugins/ecmascript/es2panda/checker/types/typeRelation.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "checker/types/typeRelation.h" +#include "checker/ETSchecker.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::checker { diff --git a/checker/types/ets/etsFunctionType.h b/checker/types/ets/etsFunctionType.h index f5aceec4a45248208df4f9416d6a9e07597d8212..5e588ff61c1fcddfdd16e354c6472f32f17ae8a9 100644 --- a/checker/types/ets/etsFunctionType.h +++ b/checker/types/ets/etsFunctionType.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_FUNCTION_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_FUNCTION_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "checker/types/type.h" +#include "checker/types/signature.h" namespace panda::es2panda::checker { diff --git a/checker/types/ets/etsObjectType.cpp b/checker/types/ets/etsObjectType.cpp index 4285b20b2d5371ec30fe3d88378f07fc16395fc0..af7582cadd2d1d5cc48da4684a645f656af38c5b 100644 --- a/checker/types/ets/etsObjectType.cpp +++ b/checker/types/ets/etsObjectType.cpp @@ -15,14 +15,14 @@ #include "etsObjectType.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/checker/types/typeFlag.h" -#include "plugins/ecmascript/es2panda/checker/types/typeRelation.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "binder/declaration.h" +#include "checker/ETSchecker.h" +#include "checker/ets/conversion.h" +#include "checker/types/typeFlag.h" +#include "checker/types/typeRelation.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::checker { diff --git a/checker/types/ets/etsObjectType.h b/checker/types/ets/etsObjectType.h index ea7cff4b8fb17b2c848cff3955629c7197bd4e5e..d23996a8617dc23c6d675f537cfb23b36975ccdf 100644 --- a/checker/types/ets/etsObjectType.h +++ b/checker/types/ets/etsObjectType.h @@ -16,12 +16,12 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_OBJECT_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_OBJECT_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" +#include "checker/types/type.h" +#include "checker/types/signature.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "binder/scope.h" +#include "ir/base/classDefinition.h" namespace panda::es2panda::checker { diff --git a/checker/types/ets/etsStringType.cpp b/checker/types/ets/etsStringType.cpp index 053341502c7bdfd9bee89a3fcafba38de95fb5a3..bd7be06726579198335731b25b56305b64714e5d 100644 --- a/checker/types/ets/etsStringType.cpp +++ b/checker/types/ets/etsStringType.cpp @@ -15,7 +15,7 @@ #include "etsStringType.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" +#include "binder/ETSBinder.h" namespace panda::es2panda::checker { void ETSStringType::Identical(TypeRelation *relation, Type *other) diff --git a/checker/types/ets/etsStringType.h b/checker/types/ets/etsStringType.h index 483e51e56525c4c3b5232e7ea19abedd88007123..4a516db40d6a9328261d3aaaaaa64d78953247b3 100644 --- a/checker/types/ets/etsStringType.h +++ b/checker/types/ets/etsStringType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_STRING_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_STRING_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" +#include "checker/types/ets/etsObjectType.h" namespace panda::es2panda::checker { class ETSStringType : public ETSObjectType { diff --git a/checker/types/ets/etsTypeParameter.h b/checker/types/ets/etsTypeParameter.h index 49b30cd0cdd570cd956a9644410d92c0706d8689..da85393c2baf386866c4cde95f0867635cccc920 100644 --- a/checker/types/ets/etsTypeParameter.h +++ b/checker/types/ets/etsTypeParameter.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_TYPE_PARAMETER_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_TYPE_PARAMETER_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class ETSTypeParameter : public Type { diff --git a/checker/types/ets/etsVoidType.h b/checker/types/ets/etsVoidType.h index 8816e0736cac88473b8e023341431bd8a8eda346..1d68486329860636c0cc8655536458f7b8b50012 100644 --- a/checker/types/ets/etsVoidType.h +++ b/checker/types/ets/etsVoidType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_VOID_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_VOID_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class ETSVoidType : public Type { diff --git a/checker/types/ets/floatType.cpp b/checker/types/ets/floatType.cpp index 129ac433da2cab4befaa25a183516fca64d0b429..d40efa8f09c0f687af01c1abe96895c4a7753755 100644 --- a/checker/types/ets/floatType.cpp +++ b/checker/types/ets/floatType.cpp @@ -15,8 +15,8 @@ #include "floatType.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/checker/ets/narrowingWideningConverter.h" +#include "checker/ets/conversion.h" +#include "checker/ets/narrowingWideningConverter.h" namespace panda::es2panda::checker { void FloatType::Identical(TypeRelation *relation, Type *other) diff --git a/checker/types/ets/floatType.h b/checker/types/ets/floatType.h index f8d2a38496ebb7a5b0d7aa6a3e7e54c811a04282..513c9b325da92a3c0a48c7596b43a9ae83c302b6 100644 --- a/checker/types/ets/floatType.h +++ b/checker/types/ets/floatType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_FLOAT_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_FLOAT_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class FloatType : public Type { diff --git a/checker/types/ets/intType.cpp b/checker/types/ets/intType.cpp index 7c87a815d0c42d3335d9e339b67e9eb2d1388a40..44c74500f22bbcff01ecdacb1b88ec02ba10b1ff 100644 --- a/checker/types/ets/intType.cpp +++ b/checker/types/ets/intType.cpp @@ -15,8 +15,8 @@ #include "intType.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/checker/ets/narrowingWideningConverter.h" +#include "checker/ets/conversion.h" +#include "checker/ets/narrowingWideningConverter.h" namespace panda::es2panda::checker { void IntType::Identical(TypeRelation *relation, Type *other) diff --git a/checker/types/ets/intType.h b/checker/types/ets/intType.h index 2326b097c1c59ed461b0c4a4d635c51d1454002c..df8f6af99a43d79d9a9db910540848d94f7e03ed 100644 --- a/checker/types/ets/intType.h +++ b/checker/types/ets/intType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_INT_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_INT_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class IntType : public Type { diff --git a/checker/types/ets/longType.cpp b/checker/types/ets/longType.cpp index f26e8d608dbae22e3c2b307f7d41b4470235696d..4246b89ccd8132492d15022b85945a346b7b0e20 100644 --- a/checker/types/ets/longType.cpp +++ b/checker/types/ets/longType.cpp @@ -15,8 +15,8 @@ #include "longType.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/checker/ets/narrowingWideningConverter.h" +#include "checker/ets/conversion.h" +#include "checker/ets/narrowingWideningConverter.h" namespace panda::es2panda::checker { void LongType::Identical(TypeRelation *relation, Type *other) diff --git a/checker/types/ets/longType.h b/checker/types/ets/longType.h index e0844ff4a4fb6bcbd3196dffc1e75e8fcc769d3c..27a2deca699ce7dc662970de1a834dc77bb3e77f 100644 --- a/checker/types/ets/longType.h +++ b/checker/types/ets/longType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_LONG_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_LONG_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class LongType : public Type { diff --git a/checker/types/ets/shortType.cpp b/checker/types/ets/shortType.cpp index 7c5a0126aed9f3b6f2addcf2f37c7e017dc9fb90..8cd1be7202dde5d5a64436f3263c3b7618c838b1 100644 --- a/checker/types/ets/shortType.cpp +++ b/checker/types/ets/shortType.cpp @@ -15,8 +15,8 @@ #include "shortType.h" -#include "plugins/ecmascript/es2panda/checker/ets/conversion.h" -#include "plugins/ecmascript/es2panda/checker/ets/narrowingWideningConverter.h" +#include "checker/ets/conversion.h" +#include "checker/ets/narrowingWideningConverter.h" namespace panda::es2panda::checker { void ShortType::Identical(TypeRelation *relation, Type *other) diff --git a/checker/types/ets/shortType.h b/checker/types/ets/shortType.h index 9f31660c75e751e38e4f45e1ad2967b96e0050db..287c0424247afe07b9a2e6a1acdc916202044808 100644 --- a/checker/types/ets/shortType.h +++ b/checker/types/ets/shortType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_SHORT_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_SHORT_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class ShortType : public Type { diff --git a/checker/types/ets/types.h b/checker/types/ets/types.h index 6589ec3bbb378ef34f0f862b6cdaf893db87dd4e..0d2918bdafb6b6789a6a54f538f0b6bc46520c0b 100644 --- a/checker/types/ets/types.h +++ b/checker/types/ets/types.h @@ -33,6 +33,6 @@ #include "etsArrayType.h" #include "wildcardType.h" #include "etsTypeParameter.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "checker/types/signature.h" #endif /* TYPES_H */ diff --git a/checker/types/ets/wildcardType.h b/checker/types/ets/wildcardType.h index 3199360895902a754a2b1b5b9a1ccdfd782bf1dd..910c8bfa54f803d54f59078aa4cf8b7e9f65da48 100644 --- a/checker/types/ets/wildcardType.h +++ b/checker/types/ets/wildcardType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_ETS_WILDCARD_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_ETS_WILDCARD_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class WildcardType : public Type { diff --git a/checker/types/globalTypesHolder.cpp b/checker/types/globalTypesHolder.cpp index 8c3891128477856a7df6f4f5c8b09cc1d0db32c3..3554c9bf6ef2b3a8033f43929dab7b06441c658a 100644 --- a/checker/types/globalTypesHolder.cpp +++ b/checker/types/globalTypesHolder.cpp @@ -15,37 +15,37 @@ #include "globalTypesHolder.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/numberType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/anyType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/stringType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/booleanType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/voidType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/nullType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/undefinedType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/unknownType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/neverType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/nonPrimitiveType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/bigintType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/booleanLiteralType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/bigintLiteralType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/numberLiteralType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/stringLiteralType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/tupleType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/objectLiteralType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/unionType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/byteType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/charType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/doubleType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/floatType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/intType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/longType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/shortType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsBooleanType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsStringType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsVoidType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/wildcardType.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "checker/types/ts/numberType.h" +#include "checker/types/ts/anyType.h" +#include "checker/types/ts/stringType.h" +#include "checker/types/ts/booleanType.h" +#include "checker/types/ts/voidType.h" +#include "checker/types/ts/nullType.h" +#include "checker/types/ts/undefinedType.h" +#include "checker/types/ts/unknownType.h" +#include "checker/types/ts/neverType.h" +#include "checker/types/ts/nonPrimitiveType.h" +#include "checker/types/ts/bigintType.h" +#include "checker/types/ts/booleanLiteralType.h" +#include "checker/types/ts/bigintLiteralType.h" +#include "checker/types/ts/numberLiteralType.h" +#include "checker/types/ts/stringLiteralType.h" +#include "checker/types/ts/tupleType.h" +#include "checker/types/ts/objectLiteralType.h" +#include "checker/types/ts/unionType.h" +#include "checker/types/ets/byteType.h" +#include "checker/types/ets/charType.h" +#include "checker/types/ets/doubleType.h" +#include "checker/types/ets/floatType.h" +#include "checker/types/ets/intType.h" +#include "checker/types/ets/longType.h" +#include "checker/types/ets/shortType.h" +#include "checker/types/ets/etsBooleanType.h" +#include "checker/types/ets/etsStringType.h" +#include "checker/types/ets/etsVoidType.h" +#include "checker/types/ets/etsObjectType.h" +#include "checker/types/ets/wildcardType.h" +#include "util/helpers.h" namespace panda::es2panda::checker { GlobalTypesHolder::GlobalTypesHolder(ArenaAllocator *allocator) : builtin_name_mappings_(allocator->Adapter()) diff --git a/checker/types/globalTypesHolder.h b/checker/types/globalTypesHolder.h index 9f9e027c4a308764cf986902062cd2b4b783d2ba..ef4c97bc80cd60425cbe5cb1de22f126ad86d643 100644 --- a/checker/types/globalTypesHolder.h +++ b/checker/types/globalTypesHolder.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_GLOBAL_TYPES_HOLDER_H #define ES2PANDA_COMPILER_CHECKER_TYPES_GLOBAL_TYPES_HOLDER_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { enum class GlobalTypeId { diff --git a/checker/types/signature.cpp b/checker/types/signature.cpp index a63d6269a94c378d183ffe1d259abe500f5f379a..5681bb9a2c938d3b384678592f3d07d5d3cb2d34 100644 --- a/checker/types/signature.cpp +++ b/checker/types/signature.cpp @@ -15,10 +15,10 @@ #include "signature.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "binder/scope.h" +#include "ir/base/scriptFunction.h" +#include "ir/ts/tsTypeParameter.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::checker { diff --git a/checker/types/signature.h b/checker/types/signature.h index 82e0bcc04f6c6298d3d759b0ad67ff370fe999dc..ab0d4ef9d248e542306bbf02d4ab9ec0735263c3 100644 --- a/checker/types/signature.h +++ b/checker/types/signature.h @@ -18,8 +18,8 @@ #include "type.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" +#include "binder/variable.h" +#include "compiler/core/compilerContext.h" namespace panda::es2panda::checker { // For use in Signature::ToAssemblerType diff --git a/checker/types/ts/anyType.h b/checker/types/ts/anyType.h index 61ad2132e27ddaeda4f6cf5022e0e4d4ed87bad3..1135634baea1edaf8f482f0332fa1857e2c934ca 100644 --- a/checker/types/ts/anyType.h +++ b/checker/types/ts/anyType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_ANY_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_ANY_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class AnyType : public Type { diff --git a/checker/types/ts/arrayType.cpp b/checker/types/ts/arrayType.cpp index 05bc497273487c57ec08f5bed857d96244b43e6c..7aa4b9eabfa145e6987c7a51a366bf025cf460d5 100644 --- a/checker/types/ts/arrayType.cpp +++ b/checker/types/ts/arrayType.cpp @@ -15,8 +15,8 @@ #include "arrayType.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/objectType.h" +#include "binder/variable.h" +#include "checker/types/ts/objectType.h" namespace panda::es2panda::checker { void ArrayType::ToString(std::stringstream &ss) const diff --git a/checker/types/ts/arrayType.h b/checker/types/ts/arrayType.h index a7b09385fa7f7a74f89c7bb609a7b0960892d37e..813d9e33fa388175ea0e1f16af3af41975cc557c 100644 --- a/checker/types/ts/arrayType.h +++ b/checker/types/ts/arrayType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_ARRAY_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_ARRAY_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class ArrayType : public Type { diff --git a/checker/types/ts/bigintLiteralType.h b/checker/types/ts/bigintLiteralType.h index 869de6e9d15982daefd4f531e1fa55e428de3b4b..bdae6081d2136bba2144227cfeceb37ce326c8b1 100644 --- a/checker/types/ts/bigintLiteralType.h +++ b/checker/types/ts/bigintLiteralType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_BIGINT_LITERAL_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_BIGINT_LITERAL_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class BigintLiteralType : public Type { diff --git a/checker/types/ts/bigintType.h b/checker/types/ts/bigintType.h index 72ec7ae94674d318802ff67a1cbd33086fc89fab..31d104785fe66951cbe37235fd4c3601898f8297 100644 --- a/checker/types/ts/bigintType.h +++ b/checker/types/ts/bigintType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_BIGINT_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_BIGINT_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class BigintType : public Type { diff --git a/checker/types/ts/booleanLiteralType.h b/checker/types/ts/booleanLiteralType.h index e00e81b2af75d5ec68ce125bdde2416e52cf4f65..01fbd8bd8c1d3cd26fd8932e7c5e01d8e9fbc5de 100644 --- a/checker/types/ts/booleanLiteralType.h +++ b/checker/types/ts/booleanLiteralType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_BOOLEAN_LITERAL_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_BOOLEAN_LITERAL_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class BooleanLiteralType : public Type { diff --git a/checker/types/ts/booleanType.h b/checker/types/ts/booleanType.h index 5f435e3097288bc714f0f318e23b9958570402e8..b6d8d747561cfd624aae079296caf8eb94fa3c26 100644 --- a/checker/types/ts/booleanType.h +++ b/checker/types/ts/booleanType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_BOOLEAN_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_BOOLEAN_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class BooleanType : public Type { diff --git a/checker/types/ts/constructorType.cpp b/checker/types/ts/constructorType.cpp index 75084929c90f14060b60234933d69500a8b0ece1..4fd6dbbc8941670d7a4c35451dcddafa71e1f57c 100644 --- a/checker/types/ts/constructorType.cpp +++ b/checker/types/ts/constructorType.cpp @@ -15,7 +15,7 @@ #include "constructorType.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "checker/types/signature.h" namespace panda::es2panda::checker { void ConstructorType::ToString(std::stringstream &ss) const diff --git a/checker/types/ts/elementFlags.h b/checker/types/ts/elementFlags.h index d3a73c35be46b19ed7998127e1885d9f19109247..fee3d68f4177610fc2dbad96bf873790bbd41e1d 100644 --- a/checker/types/ts/elementFlags.h +++ b/checker/types/ts/elementFlags.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_ELEMENT_FLAGS_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_ELEMENT_FLAGS_H -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "util/enumbitops.h" namespace panda::es2panda::checker { enum class ElementFlags : uint32_t { diff --git a/checker/types/ts/enumLiteralType.cpp b/checker/types/ts/enumLiteralType.cpp index 574b83300f9840c746612ff8306b274a36aa7e8b..f89b9745eaa4d4649c5a2bbed47f00140b7ecc9d 100644 --- a/checker/types/ts/enumLiteralType.cpp +++ b/checker/types/ts/enumLiteralType.cpp @@ -15,8 +15,8 @@ #include "enumLiteralType.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/enumType.h" +#include "binder/variable.h" +#include "checker/types/ts/enumType.h" namespace panda::es2panda::checker { void EnumLiteralType::ToString(std::stringstream &ss) const diff --git a/checker/types/ts/enumLiteralType.h b/checker/types/ts/enumLiteralType.h index e0cfacc9a0035547d3d16dc761f57bae2b06e318..596f79fc0e111fab5b4e9443491c2501a44060f8 100644 --- a/checker/types/ts/enumLiteralType.h +++ b/checker/types/ts/enumLiteralType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_ENUM_LITERAL_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_ENUM_LITERAL_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::binder { class Scope; diff --git a/checker/types/ts/enumType.cpp b/checker/types/ts/enumType.cpp index 6955580ff48591dda8778918b4abe50b2464d4dc..dabd5567cc8eb1fa6b2d1084ffe73a0d4531169c 100644 --- a/checker/types/ts/enumType.cpp +++ b/checker/types/ts/enumType.cpp @@ -15,7 +15,7 @@ #include "enumType.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" +#include "binder/variable.h" namespace panda::es2panda::checker { void EnumType::ToString(std::stringstream &ss) const diff --git a/checker/types/ts/enumType.h b/checker/types/ts/enumType.h index 74262d77a5b6d2f823378b096544f9a9150015f9..60aadce2bd94aaf39b743a40ff8e3a5ca0850aa4 100644 --- a/checker/types/ts/enumType.h +++ b/checker/types/ts/enumType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_ENUM_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_ENUM_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::binder { class EnumVariable; diff --git a/checker/types/ts/functionType.cpp b/checker/types/ts/functionType.cpp index 99b266ab612e2b06d529017169d628de1c494a4c..00aada45db501d8cba2e09d6fe1f7766fddd957e 100644 --- a/checker/types/ts/functionType.cpp +++ b/checker/types/ts/functionType.cpp @@ -15,7 +15,7 @@ #include "functionType.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "checker/types/signature.h" namespace panda::es2panda::checker { void FunctionType::ToString(std::stringstream &ss) const diff --git a/checker/types/ts/indexInfo.h b/checker/types/ts/indexInfo.h index 10007c0f4cd90ec03d3d8646772a93f01b6e01a5..772b71cb34731f0d3ca3037837449b23058110e6 100644 --- a/checker/types/ts/indexInfo.h +++ b/checker/types/ts/indexInfo.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_INDEX_INFO_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_INDEX_INFO_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class IndexInfo { diff --git a/checker/types/ts/interfaceType.cpp b/checker/types/ts/interfaceType.cpp index 2c900f4175a59e3ff6e129f599e162090869c4d1..78dfefa0a381206f2f9c10bb72ab57b80a9dabb1 100644 --- a/checker/types/ts/interfaceType.cpp +++ b/checker/types/ts/interfaceType.cpp @@ -15,9 +15,9 @@ #include "interfaceType.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/typeParameter.h" +#include "binder/variable.h" +#include "checker/checker.h" +#include "checker/types/ts/typeParameter.h" #include #include diff --git a/checker/types/ts/neverType.h b/checker/types/ts/neverType.h index 26d9c70991e92a0d8407014c821beb32235676b4..696d7929859ddb4212a09adacb8b804612b50fd6 100644 --- a/checker/types/ts/neverType.h +++ b/checker/types/ts/neverType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_NEVER_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_NEVER_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class NeverType : public Type { diff --git a/checker/types/ts/nonPrimitiveType.h b/checker/types/ts/nonPrimitiveType.h index e6daf9cacf946fe8a79eb28f0d745b6ccedff166..c771cf1dbcda772d5933858a8f51c68f78268d21 100644 --- a/checker/types/ts/nonPrimitiveType.h +++ b/checker/types/ts/nonPrimitiveType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_NON_PRIMITIVE_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_NON_PRIMITIVE_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class NonPrimitiveType : public Type { diff --git a/checker/types/ts/nullType.h b/checker/types/ts/nullType.h index eb74e36c0424f0b5ebad71d517cfea2766450148..e767a141137e73012f92c8c3a6ccc4f867dccf5a 100644 --- a/checker/types/ts/nullType.h +++ b/checker/types/ts/nullType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_NULL_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_NULL_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class NullType : public Type { diff --git a/checker/types/ts/numberLiteralType.cpp b/checker/types/ts/numberLiteralType.cpp index 48fa7564b777118c3b054f3f8d11bb6d73a502ed..a396052d1d5dc9722c753d50bacf98b36954baf6 100644 --- a/checker/types/ts/numberLiteralType.cpp +++ b/checker/types/ts/numberLiteralType.cpp @@ -15,9 +15,9 @@ #include "numberLiteralType.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/enumType.h" +#include "util/helpers.h" +#include "binder/variable.h" +#include "checker/types/ts/enumType.h" namespace panda::es2panda::checker { void NumberLiteralType::ToString(std::stringstream &ss) const diff --git a/checker/types/ts/numberLiteralType.h b/checker/types/ts/numberLiteralType.h index a7bd012c40b0543a634eca439ecb0ba12dfdc997..309c973785046d1516695f1f67e71e2ae9515591 100644 --- a/checker/types/ts/numberLiteralType.h +++ b/checker/types/ts/numberLiteralType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_NUMBER_LITERAL_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_NUMBER_LITERAL_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class NumberLiteralType : public Type { diff --git a/checker/types/ts/numberType.cpp b/checker/types/ts/numberType.cpp index 4014c65b9a4acd457b3fe418d96579a91de57605..f49a00670e64d369c7f908c1e1651056a3269fc8 100644 --- a/checker/types/ts/numberType.cpp +++ b/checker/types/ts/numberType.cpp @@ -15,8 +15,8 @@ #include "numberType.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/enumType.h" +#include "binder/variable.h" +#include "checker/types/ts/enumType.h" namespace panda::es2panda::checker { void NumberType::ToString(std::stringstream &ss) const diff --git a/checker/types/ts/numberType.h b/checker/types/ts/numberType.h index 038061eb3162b5143ae1228cca67ccf218530673..aa217be94efda8f23d73438ff013e97fefe68ce4 100644 --- a/checker/types/ts/numberType.h +++ b/checker/types/ts/numberType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_NUMBER_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_NUMBER_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class NumberType : public Type { diff --git a/checker/types/ts/objectDescriptor.cpp b/checker/types/ts/objectDescriptor.cpp index e7938ecf1d828b705b44d1c1009027a594a600ff..c47da6be2541b21352da156672cb44012ca94074 100644 --- a/checker/types/ts/objectDescriptor.cpp +++ b/checker/types/ts/objectDescriptor.cpp @@ -15,9 +15,9 @@ #include "objectDescriptor.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/indexInfo.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "binder/variable.h" +#include "checker/types/ts/indexInfo.h" +#include "checker/types/signature.h" namespace panda::es2panda::checker { binder::LocalVariable *ObjectDescriptor::FindProperty(const util::StringView &name) const diff --git a/checker/types/ts/objectDescriptor.h b/checker/types/ts/objectDescriptor.h index ecf89a6eabcd21c6d645e75359a5e2fd664929ed..c1ebc3891be4ffdfe130a6b51c5396db1e3e37a1 100644 --- a/checker/types/ts/objectDescriptor.h +++ b/checker/types/ts/objectDescriptor.h @@ -17,7 +17,7 @@ #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_OBJECT_DESCRIPTOR_H #include "macros.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" #include namespace panda::es2panda::binder { diff --git a/checker/types/ts/objectLiteralType.cpp b/checker/types/ts/objectLiteralType.cpp index 1ed3abc53601b72b655d57d8df9dce3890b0152c..20f4cadfb235b832d467fb704cb5e6c7b3c1b828 100644 --- a/checker/types/ts/objectLiteralType.cpp +++ b/checker/types/ts/objectLiteralType.cpp @@ -15,9 +15,9 @@ #include "objectLiteralType.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/indexInfo.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "binder/variable.h" +#include "checker/types/ts/indexInfo.h" +#include "checker/types/signature.h" namespace panda::es2panda::checker { class TSChecker; diff --git a/checker/types/ts/objectType.cpp b/checker/types/ts/objectType.cpp index 94c05255bdfd6bf37e33a951876f93a6a936b112..a5cea0d8ae5d395c76d8b573c66eef20f8286aaf 100644 --- a/checker/types/ts/objectType.cpp +++ b/checker/types/ts/objectType.cpp @@ -15,10 +15,10 @@ #include "objectType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/indexInfo.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/interfaceType.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" +#include "checker/types/ts/indexInfo.h" +#include "checker/types/ts/interfaceType.h" +#include "checker/types/signature.h" +#include "checker/checker.h" namespace panda::es2panda::checker { bool ObjectType::EachSignatureRelatedToSomeSignature(TypeRelation *relation, diff --git a/checker/types/ts/objectType.h b/checker/types/ts/objectType.h index 229d2e97c53b5a55d3ad15e8e510a3369d984d25..b7d76ae4ee7cd162fea76b2c485981cb217dd0a9 100644 --- a/checker/types/ts/objectType.h +++ b/checker/types/ts/objectType.h @@ -16,12 +16,12 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_OBJECT_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_OBJECT_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/objectDescriptor.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "checker/types/ts/objectDescriptor.h" +#include "binder/variable.h" +#include "util/ustring.h" +#include "util/enumbitops.h" namespace panda::es2panda::checker { class Signature; diff --git a/checker/types/ts/stringLiteralType.h b/checker/types/ts/stringLiteralType.h index 645b426f29fa2438706fb6d1465b851a5a72ebf1..462d51a978d7f7ca143bf8ce2005e9ce50728c23 100644 --- a/checker/types/ts/stringLiteralType.h +++ b/checker/types/ts/stringLiteralType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_STRING_LITERAL_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_STRING_LITERAL_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class StringLiteralType : public Type { diff --git a/checker/types/ts/stringType.h b/checker/types/ts/stringType.h index c811a1a1784d1e0b3b8006ec871d365bf65be8b3..70e3043082ba5baf343139abe528470b516d7bd9 100644 --- a/checker/types/ts/stringType.h +++ b/checker/types/ts/stringType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_STRING_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_STRING_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class StringType : public Type { diff --git a/checker/types/ts/tupleType.cpp b/checker/types/ts/tupleType.cpp index 2d395ee4f45b0dcd8bf51919bad6d21841eff594..594228dd2a45435408868c222080d5bee0e85ed6 100644 --- a/checker/types/ts/tupleType.cpp +++ b/checker/types/ts/tupleType.cpp @@ -15,7 +15,7 @@ #include "tupleType.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "checker/TSchecker.h" namespace panda::es2panda::checker { Type *TupleType::ConvertToArrayType(TSChecker *checker) diff --git a/checker/types/ts/tupleType.h b/checker/types/ts/tupleType.h index bdda3e4fbeda01b2052808fa8b611fb6d145d38f..7d0183d647d34f28cd24e727708977c4b2655098 100644 --- a/checker/types/ts/tupleType.h +++ b/checker/types/ts/tupleType.h @@ -18,9 +18,9 @@ #include "macros.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/elementFlags.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/objectType.h" +#include "binder/variable.h" +#include "checker/types/ts/elementFlags.h" +#include "checker/types/ts/objectType.h" namespace panda::es2panda::checker { using NamedTupleMemberPool = ArenaUnorderedMap; diff --git a/checker/types/ts/typeParameter.h b/checker/types/ts/typeParameter.h index 5828c4cedd3c5a60130f0f72b50955de5adb424d..3df3155d0e25c2eeffd6b24e3a97be4cf8bc27f4 100644 --- a/checker/types/ts/typeParameter.h +++ b/checker/types/ts/typeParameter.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_TYPE_PARAMETER_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_TYPE_PARAMETER_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class TypeParameter : public Type { diff --git a/checker/types/ts/typeReference.h b/checker/types/ts/typeReference.h index 713b72eb6e07d46f132cffc2d46baba80bc610d7..89b64102a7b838696e7e9bac90cf993ffc5d7cb2 100644 --- a/checker/types/ts/typeReference.h +++ b/checker/types/ts/typeReference.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_TYPE_REFERENCE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_TYPE_REFERENCE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class TypeReference : public Type { diff --git a/checker/types/ts/types.h b/checker/types/ts/types.h index 404ed5af88d9253efcea8b90d187cfd1a7f6aba2..897a20e6af9d10b260701a8c99ef4518f485064d 100644 --- a/checker/types/ts/types.h +++ b/checker/types/ts/types.h @@ -44,6 +44,6 @@ #include "indexInfo.h" #include "typeParameter.h" #include "typeReference.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "checker/types/signature.h" #endif /* TYPES_H */ diff --git a/checker/types/ts/undefinedType.h b/checker/types/ts/undefinedType.h index 4ad8ec21669affb192bc3ae51edbf8b7a600a31f..f23785dbce1c030128d59c5731286711bfc7efe0 100644 --- a/checker/types/ts/undefinedType.h +++ b/checker/types/ts/undefinedType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_UNDEFINED_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_UNDEFINED_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class UndefinedType : public Type { diff --git a/checker/types/ts/unionType.cpp b/checker/types/ts/unionType.cpp index 96ef28af7871a00507129481b148f4d105450fcf..b20105533dd381c2d48422ab8c2044cff64a4080 100644 --- a/checker/types/ts/unionType.cpp +++ b/checker/types/ts/unionType.cpp @@ -16,7 +16,7 @@ #include "unionType.h" #include -#include "plugins/ecmascript/es2panda/checker/types/globalTypesHolder.h" +#include "checker/types/globalTypesHolder.h" namespace panda::es2panda::checker { void UnionType::ToString(std::stringstream &ss) const diff --git a/checker/types/ts/unionType.h b/checker/types/ts/unionType.h index 7b235e3e437fa5e2dcda5e1173138af6a0d602d4..0b519d582b1ed973cedbf04ca877e3f738f48836 100644 --- a/checker/types/ts/unionType.h +++ b/checker/types/ts/unionType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_UNION_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_UNION_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class GlobalTypesHolder; diff --git a/checker/types/ts/unknownType.h b/checker/types/ts/unknownType.h index 538fa1b7f4beaf318f7b45c97cbebb0bd1c7d692..e3e263a12234db7b2e080e87350200a18df046c6 100644 --- a/checker/types/ts/unknownType.h +++ b/checker/types/ts/unknownType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_UNKNOWN_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_UNKNOWN_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class UnknownType : public Type { diff --git a/checker/types/ts/voidType.h b/checker/types/ts/voidType.h index 2b9bfcc7ac669104327aa40057289323b01ef8de..8d963106c967298674d68405a0e60dd810940060 100644 --- a/checker/types/ts/voidType.h +++ b/checker/types/ts/voidType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TS_VOID_TYPE_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TS_VOID_TYPE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "checker/types/type.h" namespace panda::es2panda::checker { class VoidType : public Type { diff --git a/checker/types/type.cpp b/checker/types/type.cpp index de10b2f2fdb9052af9934ed7ff539d732d1283d0..35d135fc7fa5896097d26357de5ab1e870ec3690 100644 --- a/checker/types/type.cpp +++ b/checker/types/type.cpp @@ -15,9 +15,9 @@ #include "type.h" -#include "plugins/ecmascript/es2panda/checker/types/typeFlag.h" -#include "plugins/ecmascript/es2panda/checker/types/typeRelation.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" +#include "checker/types/typeFlag.h" +#include "checker/types/typeRelation.h" +#include "checker/types/ets/etsObjectType.h" namespace panda::es2panda::checker { bool Type::IsETSNullType() const diff --git a/checker/types/type.h b/checker/types/type.h index e69eb64979f48b9a0c92dad59f800efe169b28d3..2c6d11a786a3deb0f9be83dfdd7ef7fae5b8feb8 100644 --- a/checker/types/type.h +++ b/checker/types/type.h @@ -17,9 +17,9 @@ #define ES2PANDA_COMPILER_CHECKER_TYPES_TYPE_H #include "generated/signatures.h" -#include "plugins/ecmascript/es2panda/checker/types/typeMapping.h" -#include "plugins/ecmascript/es2panda/checker/types/typeRelation.h" -#include "plugins/ecmascript/es2panda/checker/types/typeFacts.h" +#include "checker/types/typeMapping.h" +#include "checker/types/typeRelation.h" +#include "checker/types/typeFacts.h" #include "macros.h" #include diff --git a/checker/types/typeFacts.h b/checker/types/typeFacts.h index e5fe539a11e92d911ce151cec1c2251cebd1215c..918f5228eea8aa2c0b5154f6faa65dd49d373acd 100644 --- a/checker/types/typeFacts.h +++ b/checker/types/typeFacts.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TYPE_FACTS_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TYPE_FACTS_H -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "util/enumbitops.h" namespace panda::es2panda::checker { enum class TypeFacts : uint32_t { diff --git a/checker/types/typeFlag.h b/checker/types/typeFlag.h index 8f9b434e8ade056d8860a5ae682b8c64aa1ad706..720304a12a56f26d05ddbf665696034f9056f445 100644 --- a/checker/types/typeFlag.h +++ b/checker/types/typeFlag.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TYPE_FLAG_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TYPE_FLAG_H -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "util/enumbitops.h" #include diff --git a/checker/types/typeRelation.cpp b/checker/types/typeRelation.cpp index 94cfa060cc524da8e8b1b2c69cd59b97da096be3..6dda8adc8cab76b0b1adb697e93a150fc8816d43 100644 --- a/checker/types/typeRelation.cpp +++ b/checker/types/typeRelation.cpp @@ -15,9 +15,9 @@ #include "typeRelation.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/indexInfo.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "checker/checker.h" +#include "checker/types/ts/indexInfo.h" +#include "checker/types/signature.h" namespace panda::es2panda::checker { ArenaAllocator *TypeRelation::Allocator() diff --git a/checker/types/typeRelation.h b/checker/types/typeRelation.h index 93be8112173df1115af545b92c296b36a5a84ca5..6abd143d4c52736ba20e059c413848b2d43b62bb 100644 --- a/checker/types/typeRelation.h +++ b/checker/types/typeRelation.h @@ -16,10 +16,10 @@ #ifndef ES2PANDA_COMPILER_CHECKER_TYPES_TYPE_RELATION_H #define ES2PANDA_COMPILER_CHECKER_TYPES_TYPE_RELATION_H -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "lexer/token/sourceLocation.h" +#include "lexer/token/tokenType.h" +#include "util/ustring.h" +#include "util/enumbitops.h" #include "macros.h" diff --git a/compiler/base/catchTable.cpp b/compiler/base/catchTable.cpp index ae2b7d47f2e1ebfdbbf82a02d81efc466fbb538e..a19942d5a35d8b6f76dc4c621033390cb335bdc4 100644 --- a/compiler/base/catchTable.cpp +++ b/compiler/base/catchTable.cpp @@ -15,7 +15,7 @@ #include "catchTable.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" +#include "compiler/core/pandagen.h" namespace panda::es2panda::compiler { TryLabelSet::TryLabelSet(CodeGen *cg) diff --git a/compiler/base/catchTable.h b/compiler/base/catchTable.h index 6462063559de26e9716e20dfe2418ac61a8d28d4..9bd2c5d572c7e7ddee2487a822b3b7a6702cd037 100644 --- a/compiler/base/catchTable.h +++ b/compiler/base/catchTable.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_BASE_CATCH_TABLE_H #define ES2PANDA_COMPILER_BASE_CATCH_TABLE_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelPair.h" +#include "ir/irnode.h" +#include "compiler/core/labelPair.h" namespace panda::es2panda::compiler { class CodeGen; diff --git a/compiler/base/condition.cpp b/compiler/base/condition.cpp index 06da86f260a60bfb075966216dd9ebe7e3183cb2..7ebaf1929e5691f8312b8b56436f0ed46b7b5f46 100644 --- a/compiler/base/condition.cpp +++ b/compiler/base/condition.cpp @@ -15,10 +15,10 @@ #include "condition.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/unaryExpression.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/unaryExpression.h" namespace panda::es2panda::compiler { void Condition::Compile(PandaGen *pg, const ir::Expression *expr, Label *false_label) diff --git a/compiler/base/condition.h b/compiler/base/condition.h index 296fd82d8240afdc9e57bb4c3484e8b4a69a0bb0..85071b3a40643b8ddf78e2f63e2b126ace3156ae 100644 --- a/compiler/base/condition.h +++ b/compiler/base/condition.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_BASE_CONDITION_H #define ES2PANDA_COMPILER_BASE_CONDITION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::compiler { class PandaGen; diff --git a/compiler/base/destructuring.cpp b/compiler/base/destructuring.cpp index 216d9f80f7d3e0e3fce31f34231c31e14a9940c7..fbea14995db4deb09e06dbcd7567122f1fffb2c7 100644 --- a/compiler/base/destructuring.cpp +++ b/compiler/base/destructuring.cpp @@ -15,17 +15,17 @@ #include "destructuring.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/compiler/base/iterators.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" +#include "util/helpers.h" +#include "compiler/base/iterators.h" +#include "compiler/base/lreference.h" +#include "compiler/base/catchTable.h" +#include "compiler/core/pandagen.h" +#include "ir/base/property.h" +#include "ir/base/spreadElement.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/objectExpression.h" namespace panda::es2panda::compiler { static void GenRestElement(PandaGen *pg, const ir::SpreadElement *rest_element, diff --git a/compiler/base/destructuring.h b/compiler/base/destructuring.h index 29d4cb36fb00145b194e7d6038c917d03831b001..6a0662e8055b6eda69d4cc56ad6381f305e1c217 100644 --- a/compiler/base/destructuring.h +++ b/compiler/base/destructuring.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_BASE_DESTRUCTURING_H #define ES2PANDA_COMPILER_BASE_DESTRUCTURING_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::compiler { class PandaGen; diff --git a/compiler/base/hoisting.cpp b/compiler/base/hoisting.cpp index d463bc1e32ea43bedf75e60dd8cbbd0d96273148..3d555fdb356e3393b56426c77ab5d122b504fdce 100644 --- a/compiler/base/hoisting.cpp +++ b/compiler/base/hoisting.cpp @@ -15,9 +15,9 @@ #include "hoisting.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" +#include "ir/base/scriptFunction.h" +#include "binder/scope.h" +#include "compiler/core/pandagen.h" namespace panda::es2panda::compiler { static void HoistVar(PandaGen *pg, binder::Variable *var, const binder::VarDecl *decl) diff --git a/compiler/base/iterators.cpp b/compiler/base/iterators.cpp index c6c34c7d56a789e66ea05494d456ed6b4fa9f726..a3e78d43d0ced25daca712447d8d302cdcc524f6 100644 --- a/compiler/base/iterators.cpp +++ b/compiler/base/iterators.cpp @@ -15,9 +15,9 @@ #include "iterators.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/compiler/function/functionBuilder.h" +#include "compiler/core/pandagen.h" +#include "compiler/base/catchTable.h" +#include "compiler/function/functionBuilder.h" namespace panda::es2panda::compiler { // Iterator diff --git a/compiler/base/iterators.h b/compiler/base/iterators.h index 5580eecdc794e0570e0c2589df9374997d3a284c..e63183ad1867005cac921c4ac100c1c2176608d5 100644 --- a/compiler/base/iterators.h +++ b/compiler/base/iterators.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_BASE_ITERATORS_H #define ES2PANDA_COMPILER_BASE_ITERATORS_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "ir/irnode.h" namespace panda::es2panda::ir { class AstNode; diff --git a/compiler/base/lexenv.cpp b/compiler/base/lexenv.cpp index 7806cde95bbb0cf04dd320a033d5e128ef99cf1a..29f7582b124b92b47f0d9a3ed47afde1f584d336 100644 --- a/compiler/base/lexenv.cpp +++ b/compiler/base/lexenv.cpp @@ -15,11 +15,11 @@ #include "lexenv.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/core/envScope.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/moduleContext.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "binder/variable.h" +#include "compiler/core/envScope.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/moduleContext.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::compiler { // Helpers diff --git a/compiler/base/lexenv.h b/compiler/base/lexenv.h index a4143470b04cc7f44fac408ad7f3f00e7a8082e9..325ff6475cf721b78399eca130d0faf03138b1da 100644 --- a/compiler/base/lexenv.h +++ b/compiler/base/lexenv.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_SCOPES_LEXENV_H #define ES2PANDA_COMPILER_SCOPES_LEXENV_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "binder/scope.h" +#include "ir/irnode.h" namespace panda::es2panda::compiler { class PandaGen; diff --git a/compiler/base/literals.cpp b/compiler/base/literals.cpp index 8a0ccd76c7363baf51d131d62d527ecde7e5f6f9..bc6655873fb5bdb77e0709d1e667e497cf1f6a04 100644 --- a/compiler/base/literals.cpp +++ b/compiler/base/literals.cpp @@ -15,10 +15,10 @@ #include "literals.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/ir/base/templateElement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/taggedTemplateExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/templateLiteral.h" +#include "compiler/core/pandagen.h" +#include "ir/base/templateElement.h" +#include "ir/expressions/taggedTemplateExpression.h" +#include "ir/expressions/templateLiteral.h" namespace panda::es2panda::compiler { void Literals::GetTemplateObject(PandaGen *pg, const ir::TaggedTemplateExpression *lit) diff --git a/compiler/base/literals.h b/compiler/base/literals.h index a1e30e6c3f32432274e0a4754759f128745c50d7..ec799f0b61fbbe953e2828f0505c55ddced46437 100644 --- a/compiler/base/literals.h +++ b/compiler/base/literals.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_BASE_LITERALS_H #define ES2PANDA_COMPILER_BASE_LITERALS_H -#include "plugins/ecmascript/es2panda/ir/expressions/literal.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/expressions/literal.h" +#include "util/ustring.h" #include diff --git a/compiler/base/lreference.cpp b/compiler/base/lreference.cpp index e7c10eabf74fe133a7c2ea1f851507f81bd852e5..0f09dcd1dfaa5e3ce7ff169ec3cb0b78257243d9 100644 --- a/compiler/base/lreference.cpp +++ b/compiler/base/lreference.cpp @@ -15,22 +15,22 @@ #include "lreference.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/compiler/base/destructuring.h" -#include "plugins/ecmascript/es2panda/compiler/core/function.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "binder/declaration.h" +#include "binder/variableFlags.h" +#include "compiler/base/destructuring.h" +#include "compiler/core/function.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astNode.h" +#include "ir/base/spreadElement.h" +#include "ir/base/classProperty.h" +#include "ir/base/classDefinition.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/memberExpression.h" +#include "ir/statements/variableDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "util/helpers.h" namespace panda::es2panda::compiler { diff --git a/compiler/base/lreference.h b/compiler/base/lreference.h index 7376fd54ed1688446e37aaa3618c79839cd4c242..083327793688b1d0061206a17034db0ac7cc575b 100644 --- a/compiler/base/lreference.h +++ b/compiler/base/lreference.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_BASE_JSLREFERENCE_H #define ES2PANDA_COMPILER_BASE_JSLREFERENCE_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "binder/scope.h" +#include "ir/irnode.h" namespace panda::es2panda::ir { class AstNode; diff --git a/compiler/base/optionalChain.cpp b/compiler/base/optionalChain.cpp index aa85b6c5845e00e1d9f443b806576909a7cc719f..441985b5f3724a110b5a5664bea7002f7a3b427b 100644 --- a/compiler/base/optionalChain.cpp +++ b/compiler/base/optionalChain.cpp @@ -15,7 +15,7 @@ #include "optionalChain.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" +#include "compiler/core/pandagen.h" namespace panda::es2panda::compiler { OptionalChain::OptionalChain(PandaGen *pg, const ir::AstNode *node) : pg_(pg), node_(node), prev_(pg->optional_chain_) diff --git a/compiler/base/optionalChain.h b/compiler/base/optionalChain.h index 6029493a31695fc6a842c7a587c1240b173d4869..b48c9b47e469d7b7c22b70cada38afacc07fc213 100644 --- a/compiler/base/optionalChain.h +++ b/compiler/base/optionalChain.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_BASE_OPTIONAL_CHAIN_H #define ES2PANDA_COMPILER_BASE_OPTIONAL_CHAIN_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/irnode.h" +#include "ir/expression.h" namespace panda::es2panda::compiler { class PandaGen; diff --git a/compiler/core/ETSGen.cpp b/compiler/core/ETSGen.cpp index 101b0811e5964baf678510fdaa35ee235b4b8459..c6c4dc75e3f10598bad5ed5d91f90235960790c5 100644 --- a/compiler/core/ETSGen.cpp +++ b/compiler/core/ETSGen.cpp @@ -15,32 +15,32 @@ #include "ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/templateLiteral.h" -#include "plugins/ecmascript/es2panda/ir/statements/breakStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/continueStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/tryStatement.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/compiler/core/dynamicContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/checker/types/typeFlag.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/classDefinition.h" +#include "ir/statement.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/templateLiteral.h" +#include "ir/statements/breakStatement.h" +#include "ir/statements/continueStatement.h" +#include "ir/statements/tryStatement.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "binder/variableFlags.h" +#include "compiler/base/lreference.h" +#include "compiler/base/catchTable.h" +#include "compiler/core/dynamicContext.h" +#include "compiler/core/compilerContext.h" +#include "binder/ETSBinder.h" +#include "binder/variable.h" +#include "checker/types/type.h" +#include "checker/types/typeFlag.h" +#include "checker/checker.h" +#include "checker/ETSchecker.h" +#include "checker/types/ets/etsObjectType.h" +#include "checker/types/ets/types.h" +#include "parser/program/program.h" namespace panda::es2panda::compiler { diff --git a/compiler/core/ETSGen.h b/compiler/core/ETSGen.h index 8b1cce97edcc379a45c6079ed0e7d31982935878..b8ce627669d3568c00c40f9dbea30c3fbfa3c8a9 100644 --- a/compiler/core/ETSGen.h +++ b/compiler/core/ETSGen.h @@ -16,13 +16,13 @@ #ifndef ES2PANDA_COMPILER_CORE_ETSGEN_H #define ES2PANDA_COMPILER_CORE_ETSGEN_H -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/compiler/core/codeGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSfunction.h" -#include "plugins/ecmascript/es2panda/compiler/core/targetTypeContext.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "ir/astNode.h" +#include "binder/ETSBinder.h" +#include "compiler/core/codeGen.h" +#include "compiler/core/ETSfunction.h" +#include "compiler/core/targetTypeContext.h" +#include "checker/ETSchecker.h" +#include "util/helpers.h" namespace panda::es2panda::compiler { diff --git a/compiler/core/ETSemitter.cpp b/compiler/core/ETSemitter.cpp index 41d4d41af1edf2e0a32a2d0f6d525e13ded84aa1..5577080ed752f21124420f23cd4a5bd023f15b47 100644 --- a/compiler/core/ETSemitter.cpp +++ b/compiler/core/ETSemitter.cpp @@ -15,31 +15,31 @@ #include "ETSemitter.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" +#include "compiler/core/ETSGen.h" +#include "binder/binder.h" +#include "binder/variableFlags.h" +#include "binder/ETSBinder.h" +#include "ir/astNode.h" +#include "ir/expressions/identifier.h" +#include "ir/base/decorator.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/classDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/classProperty.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsEnumMember.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsInterfaceBody.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/typeNode.h" +#include "parser/program/program.h" +#include "compiler/core/compilerContext.h" +#include "checker/checker.h" +#include "checker/types/signature.h" +#include "checker/ETSchecker.h" +#include "checker/types/type.h" +#include "checker/types/ets/types.h" #include "assembly-program.h" diff --git a/compiler/core/ETSfunction.cpp b/compiler/core/ETSfunction.cpp index e12ae17a47700450055e6cf213e69cf7406bbe69..564756e3ee130b84c11bd23a6a46b058f451da48 100644 --- a/compiler/core/ETSfunction.cpp +++ b/compiler/core/ETSfunction.cpp @@ -15,24 +15,24 @@ #include "ETSfunction.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/envScope.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsParameterExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" +#include "binder/binder.h" +#include "binder/ETSBinder.h" +#include "util/helpers.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "compiler/base/lreference.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/envScope.h" +#include "ir/base/spreadElement.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/classDefinition.h" +#include "ir/base/classProperty.h" +#include "ir/ets/etsParameterExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/statements/blockStatement.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsEnumMember.h" +#include "checker/types/ets/types.h" namespace panda::es2panda::compiler { void ETSFunction::CallImplicitCtor(ETSGen *etsg) diff --git a/compiler/core/ETSfunction.h b/compiler/core/ETSfunction.h index 09485acffb93fa7ea2abe8535167054800d58b24..07a660585557ab14ff8828a20073207ebc3ce789 100644 --- a/compiler/core/ETSfunction.h +++ b/compiler/core/ETSfunction.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CORE_ETSFUNCTION_H #define ES2PANDA_COMPILER_CORE_ETSFUNCTION_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "ir/irnode.h" namespace panda::es2panda::ir { class ScriptFunction; diff --git a/compiler/core/JSemitter.cpp b/compiler/core/JSemitter.cpp index 3f28fe071c928effa94d92bb860fa86161e9c7fe..f050cc9c2784f93c7e3995d0da5be0c7b3a40c2f 100644 --- a/compiler/core/JSemitter.cpp +++ b/compiler/core/JSemitter.cpp @@ -15,15 +15,16 @@ #include "JSemitter.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" +#include "compiler/core/pandagen.h" +#include "binder/binder.h" +#include "parser/program/program.h" +#include "compiler/core/compilerContext.h" #include "assembly-program.h" namespace panda::es2panda::compiler { pandasm::Function *JSFunctionEmitter::GenFunctionSignature() { +#ifdef PANDA_WITH_ECMASCRIPT auto *func = new pandasm::Function(Cg()->InternalName().Mutf8(), panda_file::SourceLang::ECMASCRIPT); GetProgramElement()->SetFunction(func); @@ -38,6 +39,9 @@ pandasm::Function *JSFunctionEmitter::GenFunctionSignature() func->return_type = pandasm::Type("any", 0); return func; +#else + UNREACHABLE(); +#endif } void JSFunctionEmitter::GenVariableSignature(pandasm::debuginfo::LocalVariable &variable_debug, @@ -70,9 +74,13 @@ void JSFunctionEmitter::GenFunctionAnnotations(pandasm::Function *func) void JSEmitter::GenAnnotation() { +#ifdef PANDA_WITH_ECMASCRIPT Program()->lang = panda_file::SourceLang::ECMASCRIPT; GenESAnnotationRecord(); GenESModuleModeRecord(Context()->Binder()->Program()->Kind() == parser::ScriptKind::MODULE); +#else + UNREACHABLE(); +#endif } void JSEmitter::GenESAnnotationRecord() diff --git a/compiler/core/codeGen.cpp b/compiler/core/codeGen.cpp index 44d7cccfc9d07bee6a98489e6e89495c74c90ed1..236ef4928537c4a1b0d18e1387bbae98a9852a99 100644 --- a/compiler/core/codeGen.cpp +++ b/compiler/core/codeGen.cpp @@ -15,14 +15,14 @@ #include "codeGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/emitter.h" -#include "plugins/ecmascript/es2panda/compiler/core/regAllocator.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/dynamicContext.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "compiler/core/emitter.h" +#include "compiler/core/regAllocator.h" +#include "compiler/core/regScope.h" +#include "compiler/core/compilerContext.h" +#include "compiler/core/dynamicContext.h" +#include "compiler/base/catchTable.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::compiler { diff --git a/compiler/core/codeGen.h b/compiler/core/codeGen.h index b7e1a0025242936814d2d29b377adb732fb4507e..23dd9a0e0949c96e8d5eac61c532edb35ee8ed94 100644 --- a/compiler/core/codeGen.h +++ b/compiler/core/codeGen.h @@ -16,10 +16,10 @@ #ifndef ES2PANDA_COMPILER_CORE_CODEGEN_H #define ES2PANDA_COMPILER_CORE_CODEGEN_H -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/compiler/core/regAllocator.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/compiler/core/dynamicContext.h" +#include "compiler/base/literals.h" +#include "compiler/core/regAllocator.h" +#include "compiler/core/regScope.h" +#include "compiler/core/dynamicContext.h" namespace panda::es2panda::compiler { class CatchTable; diff --git a/compiler/core/compileJob.cpp b/compiler/core/compileJob.cpp index c71eadb0a3f49fdae5e371a0ba350be87a8cc4cc..d9a3b77a89b083935b9bfbe19891bd5bfdcb53a5 100644 --- a/compiler/core/compileJob.cpp +++ b/compiler/core/compileJob.cpp @@ -15,7 +15,7 @@ #include "compileQueue.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" +#include "compiler/core/compilerContext.h" namespace panda::es2panda::compiler { diff --git a/compiler/core/compileJob.h b/compiler/core/compileJob.h index 9ed8c5116bdc53a78be42851b1b7073f860f6768..db50df86972de63a89e5cf3a218344401033733d 100644 --- a/compiler/core/compileJob.h +++ b/compiler/core/compileJob.h @@ -17,8 +17,8 @@ #define ES2PANDA_COMPILER_CORE_COMPILE_JOB_H #include "macros.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/compiler/core/programElement.h" +#include "es2panda.h" +#include "compiler/core/programElement.h" #include #include diff --git a/compiler/core/compileQueue.cpp b/compiler/core/compileQueue.cpp index 8111ec2c698419a49c9f292ebc55ae13d09de90c..0804be0af0a654376180aa4c2f81775d426b09ae 100644 --- a/compiler/core/compileQueue.cpp +++ b/compiler/core/compileQueue.cpp @@ -15,12 +15,12 @@ #include "compileQueue.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/emitter.h" -#include "plugins/ecmascript/es2panda/compiler/core/function.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" +#include "binder/binder.h" +#include "binder/scope.h" +#include "compiler/core/compilerContext.h" +#include "compiler/core/emitter.h" +#include "compiler/core/function.h" +#include "compiler/core/pandagen.h" namespace panda::es2panda::compiler { CompileQueue::CompileQueue(size_t thread_count) diff --git a/compiler/core/compileQueue.h b/compiler/core/compileQueue.h index 237ef90ec57bfd18417f82472bf97a89419a99fd..4544c756e12f7bcd35ee236460e10be2f1658877 100644 --- a/compiler/core/compileQueue.h +++ b/compiler/core/compileQueue.h @@ -18,8 +18,8 @@ #include "macros.h" #include "os/thread.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/compiler/core/compileJob.h" +#include "es2panda.h" +#include "compiler/core/compileJob.h" #include #include diff --git a/compiler/core/compilerContext.h b/compiler/core/compilerContext.h index 4fce74d0619f23e1b9fe3213ed05e24c7bf134ff..93cdfa97fea8848ee84b00277262b0c037320647 100644 --- a/compiler/core/compilerContext.h +++ b/compiler/core/compilerContext.h @@ -18,8 +18,8 @@ #include "macros.h" #include "mem/arena_allocator.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" +#include "es2panda.h" +#include "compiler/base/literals.h" #include #include diff --git a/compiler/core/compilerImpl.cpp b/compiler/core/compilerImpl.cpp index 47dc873d597c123cbf7ff93e9cbb079d51af9e4d..de5fa34d1e6138b10374b5890d53c472c4aeeea9 100644 --- a/compiler/core/compilerImpl.cpp +++ b/compiler/core/compilerImpl.cpp @@ -15,30 +15,30 @@ #include "compilerImpl.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/compileQueue.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerImpl.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/JSemitter.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSemitter.h" -#include "plugins/ecmascript/es2panda/compiler/lowering/phase.h" -#include "plugins/ecmascript/es2panda/parser/parserImpl.h" -#include "plugins/ecmascript/es2panda/parser/JSparser.h" -#include "plugins/ecmascript/es2panda/parser/ASparser.h" -#include "plugins/ecmascript/es2panda/parser/TSparser.h" -#include "plugins/ecmascript/es2panda/parser/ETSparser.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/binder/JSBinder.h" -#include "plugins/ecmascript/es2panda/binder/ASBinder.h" -#include "plugins/ecmascript/es2panda/binder/TSBinder.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ASchecker.h" -#include "plugins/ecmascript/es2panda/checker/JSchecker.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/util/declgenEts2Ts.h" +#include "compiler/core/compilerContext.h" +#include "compiler/core/compileQueue.h" +#include "compiler/core/compilerImpl.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/JSemitter.h" +#include "compiler/core/ETSemitter.h" +#include "compiler/lowering/phase.h" +#include "parser/parserImpl.h" +#include "parser/JSparser.h" +#include "parser/ASparser.h" +#include "parser/TSparser.h" +#include "parser/ETSparser.h" +#include "parser/program/program.h" +#include "binder/JSBinder.h" +#include "binder/ASBinder.h" +#include "binder/TSBinder.h" +#include "binder/ETSBinder.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/ASchecker.h" +#include "checker/JSchecker.h" +#include "es2panda.h" +#include "util/declgenEts2Ts.h" #include #include diff --git a/compiler/core/compilerImpl.h b/compiler/core/compilerImpl.h index 56d06700683ba4547d0155c34fd4d763c9f0c59f..cee0090c005d3e6cede14ae5c38d18c58b436d61 100644 --- a/compiler/core/compilerImpl.h +++ b/compiler/core/compilerImpl.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_INCLUDE_COMPILER_IMPL_H #define ES2PANDA_COMPILER_INCLUDE_COMPILER_IMPL_H -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/compiler/core/compileQueue.h" +#include "es2panda.h" +#include "compiler/core/compileQueue.h" #include "macros.h" #include "mem/arena_allocator.h" #include "os/thread.h" diff --git a/compiler/core/dynamicContext.cpp b/compiler/core/dynamicContext.cpp index f08786eb5a0d4461bd9fae912c9941334a0f68ef..f153acb2d692d0201d804acc84f9b3c6b6c2621c 100644 --- a/compiler/core/dynamicContext.cpp +++ b/compiler/core/dynamicContext.cpp @@ -15,20 +15,20 @@ #include "dynamicContext.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/compiler/core/envScope.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/base/catchClause.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/breakStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/continueStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/tryStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/labelledStatement.h" +#include "checker/types/ets/etsObjectType.h" +#include "checker/types/type.h" +#include "compiler/core/envScope.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/pandagen.h" +#include "compiler/base/catchTable.h" +#include "ir/expressions/identifier.h" +#include "ir/base/catchClause.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/breakStatement.h" +#include "ir/statements/continueStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/statements/tryStatement.h" +#include "ir/statements/labelledStatement.h" namespace panda::es2panda::compiler { DynamicContext::DynamicContext(CodeGen *cg, LabelTarget target) diff --git a/compiler/core/dynamicContext.h b/compiler/core/dynamicContext.h index 476c99298debb617dbf5168dac79e886a4e988da..5ea987cbead0a6b2ad603f447184197179666ff6 100644 --- a/compiler/core/dynamicContext.h +++ b/compiler/core/dynamicContext.h @@ -16,10 +16,10 @@ #ifndef ES2PANDA_COMPILER_CORE_DYNAMIC_CONTEXT_H #define ES2PANDA_COMPILER_CORE_DYNAMIC_CONTEXT_H -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" -#include "plugins/ecmascript/es2panda/compiler/base/iterators.h" +#include "util/ustring.h" +#include "ir/irnode.h" +#include "compiler/core/labelTarget.h" +#include "compiler/base/iterators.h" namespace panda::es2panda::ir { class TryStatement; diff --git a/compiler/core/emitter.cpp b/compiler/core/emitter.cpp index 7d77ab5a042ee80d046d918f39e384f4e006560b..0891cfe7dd533f03811a7b1381f9a448f9b23328 100644 --- a/compiler/core/emitter.cpp +++ b/compiler/core/emitter.cpp @@ -15,20 +15,20 @@ #include "emitter.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/codeGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regSpiller.h" -#include "plugins/ecmascript/es2panda/compiler/debugger/debuginfoDumper.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "ir/irnode.h" +#include "util/helpers.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "compiler/base/literals.h" +#include "compiler/core/compilerContext.h" +#include "compiler/core/codeGen.h" +#include "compiler/core/regSpiller.h" +#include "compiler/debugger/debuginfoDumper.h" +#include "compiler/base/catchTable.h" +#include "es2panda.h" +#include "ir/statements/blockStatement.h" +#include "parser/program/program.h" +#include "checker/types/type.h" #include "generated/isa.h" #include "macros.h" @@ -355,8 +355,9 @@ Emitter::~Emitter() delete prog_; } -static void UpdateLiteralBufferId(panda::pandasm::Ins *ins, uint32_t offset) +static void UpdateLiteralBufferId([[maybe_unused]] panda::pandasm::Ins *ins, [[maybe_unused]] uint32_t offset) { +#ifdef PANDA_WITH_ECMASCRIPT switch (ins->opcode) { case pandasm::Opcode::ECMA_DEFINECLASSWITHBUFFER: { ins->imms.back() = std::get(ins->imms.back()) + offset; @@ -376,6 +377,9 @@ static void UpdateLiteralBufferId(panda::pandasm::Ins *ins, uint32_t offset) break; } } +#else + UNREACHABLE(); +#endif } void Emitter::AddProgramElement(ProgramElement *program_element) diff --git a/compiler/core/emitter.h b/compiler/core/emitter.h index b05d9a140a66d38b940f381900ac0855fd8c0c12..9f86ca2b19d2feb7f1054ffcafd0d5a8b8d923ac 100644 --- a/compiler/core/emitter.h +++ b/compiler/core/emitter.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CORE_EMITTER_H #define ES2PANDA_COMPILER_CORE_EMITTER_H -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "compiler/base/literals.h" +#include "util/ustring.h" #include #include diff --git a/compiler/core/envScope.cpp b/compiler/core/envScope.cpp index 1db2b27a8bfb51c9291c3094d0e322cfc94feae8..3147472ba85b6dd40d002948aec57b8515c98fe4 100644 --- a/compiler/core/envScope.cpp +++ b/compiler/core/envScope.cpp @@ -15,9 +15,9 @@ #include "envScope.h" -#include "plugins/ecmascript/es2panda/compiler/core/codeGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "compiler/core/codeGen.h" +#include "compiler/core/pandagen.h" +#include "ir/statement.h" namespace panda::es2panda::compiler { ScopeContext::ScopeContext(CodeGen *cg, binder::Scope *new_scope) : cg_(cg), prev_scope_(cg_->scope_) diff --git a/compiler/core/envScope.h b/compiler/core/envScope.h index 19eecbb3cbd299c5d38492f309d03d2f323f9b31..a5b53e72b118a58ddf4bb8f58f85634b12fffe88 100644 --- a/compiler/core/envScope.h +++ b/compiler/core/envScope.h @@ -16,11 +16,11 @@ #ifndef ES2PANDA_COMPILER_CORE_ENV_SCOPE_H #define ES2PANDA_COMPILER_CORE_ENV_SCOPE_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/compiler/core/dynamicContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" +#include "binder/scope.h" +#include "ir/irnode.h" +#include "compiler/core/dynamicContext.h" +#include "compiler/core/regScope.h" +#include "compiler/core/labelTarget.h" namespace panda::es2panda::ir { class AstNode; diff --git a/compiler/core/function.cpp b/compiler/core/function.cpp index 3d290dd1c4a85e9781e78dfac61f0b61fa4be7d7..d84c0a42b16ecfc666b7d208e630bd49ff6971d7 100644 --- a/compiler/core/function.cpp +++ b/compiler/core/function.cpp @@ -15,18 +15,18 @@ #include "function.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" +#include "binder/binder.h" +#include "util/helpers.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "compiler/base/lreference.h" +#include "compiler/core/pandagen.h" +#include "ir/base/classDefinition.h" +#include "ir/base/classProperty.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/statements/blockStatement.h" namespace panda::es2panda::compiler { static void CompileSourceBlock(PandaGen *pg, const ir::BlockStatement *block) diff --git a/compiler/core/function.h b/compiler/core/function.h index 23697494b68be9ae9aefff9d5570f7106c173350..e1539b2e08cd6177e3961f2be3c55062fbb30713 100644 --- a/compiler/core/function.h +++ b/compiler/core/function.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CORE_FUNCTION_H #define ES2PANDA_COMPILER_CORE_FUNCTION_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "ir/irnode.h" namespace panda::es2panda::ir { class ScriptFunction; diff --git a/compiler/core/labelPair.h b/compiler/core/labelPair.h index 5a58518759bb36cabc8579b8922ba590f3f27667..1ee0ad6a39faf68813db1d35bc79458882e245d4 100644 --- a/compiler/core/labelPair.h +++ b/compiler/core/labelPair.h @@ -17,7 +17,7 @@ #define ES2PANDA_COMPILER_CORE_LABEL_PAIR_H #include "macros.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "ir/irnode.h" namespace panda::es2panda::compiler { class LabelPair { diff --git a/compiler/core/labelTarget.cpp b/compiler/core/labelTarget.cpp index 46cd518c75f8f2b99c7bc844644a498c2e9a6f7f..68b43514a79bb6d7ca8e88ba96fa362edf8c3a8d 100644 --- a/compiler/core/labelTarget.cpp +++ b/compiler/core/labelTarget.cpp @@ -15,7 +15,7 @@ #include "labelTarget.h" -#include "plugins/ecmascript/es2panda/compiler/core/codeGen.h" +#include "compiler/core/codeGen.h" namespace panda::es2panda::compiler { LabelTarget::LabelTarget(CodeGen *cg) diff --git a/compiler/core/labelTarget.h b/compiler/core/labelTarget.h index fdc08493de05bee47d461ab96196abf5e5bd6655..96813f07c15ba48c50a020e06f044989b7a3896d 100644 --- a/compiler/core/labelTarget.h +++ b/compiler/core/labelTarget.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CORE_LABEL_TARGET_H #define ES2PANDA_COMPILER_CORE_LABEL_TARGET_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelPair.h" +#include "ir/irnode.h" +#include "compiler/core/labelPair.h" #include diff --git a/compiler/core/moduleContext.cpp b/compiler/core/moduleContext.cpp index 3ecfe4a38f85f993bd7c4d998fdf9e3eb7e48244..c4522f64251ccc3d8c527ec9722afb073db781b0 100644 --- a/compiler/core/moduleContext.cpp +++ b/compiler/core/moduleContext.cpp @@ -15,14 +15,14 @@ #include "moduleContext.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/module/exportAllDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportNamedDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "compiler/base/lreference.h" +#include "compiler/core/pandagen.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/module/exportAllDeclaration.h" +#include "ir/module/exportNamedDeclaration.h" +#include "ir/module/importDeclaration.h" namespace panda::es2panda::compiler { void CompileImports(PandaGen *pg, binder::ModuleScope *scope) diff --git a/compiler/core/moduleContext.h b/compiler/core/moduleContext.h index f7ebe81e6edfff60b5a43272dc0a31612703570c..6e7364479a9729c3ee1bf0fd88ead5bef93b880f 100644 --- a/compiler/core/moduleContext.h +++ b/compiler/core/moduleContext.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_CORE_MODULE_CONTEXT_H #define ES2PANDA_COMPILER_CORE_MODULE_CONTEXT_H -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" #include diff --git a/compiler/core/pandagen.cpp b/compiler/core/pandagen.cpp index 12ab5296ec886bf9876b292d00c5f650d91b5889..699ebc6daeb8c760defc0ce46ffb47d94ded0d2e 100644 --- a/compiler/core/pandagen.cpp +++ b/compiler/core/pandagen.cpp @@ -15,33 +15,247 @@ #include "pandagen.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" -#include "plugins/ecmascript/es2panda/checker/types/globalTypesHolder.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/compiler/base/lexenv.h" -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" -#include "plugins/ecmascript/es2panda/compiler/core/regAllocator.h" -#include "plugins/ecmascript/es2panda/compiler/function/asyncFunctionBuilder.h" -#include "plugins/ecmascript/es2panda/compiler/function/asyncGeneratorFunctionBuilder.h" -#include "plugins/ecmascript/es2panda/compiler/function/functionBuilder.h" -#include "plugins/ecmascript/es2panda/compiler/function/generatorFunctionBuilder.h" -#include "plugins/ecmascript/es2panda/es2panda.h" +#include "binder/binder.h" +#include "checker/checker.h" +#include "checker/types/globalTypesHolder.h" +#include "util/helpers.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "compiler/base/catchTable.h" +#include "compiler/base/lexenv.h" +#include "compiler/base/literals.h" +#include "compiler/core/compilerContext.h" +#include "compiler/core/labelTarget.h" +#include "compiler/core/regAllocator.h" +#include "compiler/function/asyncFunctionBuilder.h" +#include "compiler/function/asyncGeneratorFunctionBuilder.h" +#include "compiler/function/functionBuilder.h" +#include "compiler/function/generatorFunctionBuilder.h" +#include "es2panda.h" #include "generated/isa.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/spreadElement.h" +#include "ir/statement.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" namespace panda::es2panda::compiler { +#ifndef PANDA_WITH_ECMASCRIPT +class EcmaDisabled : public IRNode { +public: + template + explicit EcmaDisabled(const ir::AstNode *node, [[maybe_unused]] Args &&...args) : IRNode(node) + { + UNREACHABLE(); + } + + Formats GetFormats() const override + { + UNREACHABLE(); + } + + size_t Registers([[maybe_unused]] std::array *regs) override + { + UNREACHABLE(); + } + + size_t Registers([[maybe_unused]] std::array *regs) const override + { + UNREACHABLE(); + } + + size_t OutRegisters([[maybe_unused]] std::array *regs) const override + { + UNREACHABLE(); + } + + void Transform([[maybe_unused]] pandasm::Ins *ins, [[maybe_unused]] ProgramElement *program_element, + [[maybe_unused]] uint32_t total_regs) const override + { + UNREACHABLE(); + } +}; + +using EcmaLdhole = EcmaDisabled; +using EcmaLdnan = EcmaDisabled; +using EcmaLdinfinity = EcmaDisabled; +using EcmaLdglobal = EcmaDisabled; +using EcmaLdundefined = EcmaDisabled; +using EcmaLdsymbol = EcmaDisabled; +using EcmaLdnull = EcmaDisabled; +using EcmaLdtrue = EcmaDisabled; +using EcmaLdfalse = EcmaDisabled; +using EcmaTryldglobalbyname = EcmaDisabled; +using EcmaTrystglobalbyname = EcmaDisabled; +using EcmaLdobjbyname = EcmaDisabled; +using EcmaStobjbyname = EcmaDisabled; +using EcmaLdobjbyindex = EcmaDisabled; +using EcmaLdobjbyvalue = EcmaDisabled; +using EcmaStobjbyvalue = EcmaDisabled; +using EcmaStobjbyindex = EcmaDisabled; +using EcmaStownbyname = EcmaDisabled; +using EcmaStownbyvalue = EcmaDisabled; +using EcmaStownbyindex = EcmaDisabled; +using EcmaDelobjprop = EcmaDisabled; +using EcmaLdglobalvar = EcmaDisabled; +using EcmaStglobalvar = EcmaDisabled; +using EcmaLdbigint = EcmaDisabled; +using EcmaEqdyn = EcmaDisabled; +using EcmaNoteqdyn = EcmaDisabled; +using EcmaStricteqdyn = EcmaDisabled; +using EcmaStrictnoteqdyn = EcmaDisabled; +using EcmaLessdyn = EcmaDisabled; +using EcmaLesseqdyn = EcmaDisabled; +using EcmaGreaterdyn = EcmaDisabled; +using EcmaGreatereqdyn = EcmaDisabled; +using EcmaTonumber = EcmaDisabled; +using EcmaNegdyn = EcmaDisabled; +using EcmaNotdyn = EcmaDisabled; +using EcmaNegate = EcmaDisabled; +using EcmaIncdyn = EcmaDisabled; +using EcmaDecdyn = EcmaDisabled; +using EcmaEqdyn = EcmaDisabled; +using EcmaNoteqdyn = EcmaDisabled; +using EcmaStricteqdyn = EcmaDisabled; +using EcmaStrictnoteqdyn = EcmaDisabled; +using EcmaLessdyn = EcmaDisabled; +using EcmaLesseqdyn = EcmaDisabled; +using EcmaGreaterdyn = EcmaDisabled; +using EcmaGreatereqdyn = EcmaDisabled; +using EcmaAdd2dyn = EcmaDisabled; +using EcmaSub2dyn = EcmaDisabled; +using EcmaMul2dyn = EcmaDisabled; +using EcmaDiv2dyn = EcmaDisabled; +using EcmaMod2dyn = EcmaDisabled; +using EcmaExpdyn = EcmaDisabled; +using EcmaShl2dyn = EcmaDisabled; +using EcmaShr2dyn = EcmaDisabled; +using EcmaAshr2dyn = EcmaDisabled; +using EcmaAnd2dyn = EcmaDisabled; +using EcmaOr2dyn = EcmaDisabled; +using EcmaXor2dyn = EcmaDisabled; +using EcmaIsindyn = EcmaDisabled; +using EcmaInstanceofdyn = EcmaDisabled; +using EcmaIsundefined = EcmaDisabled; +using EcmaIsundefined = EcmaDisabled; +using EcmaJtrue = EcmaDisabled; +using EcmaIstrue = EcmaDisabled; +using EcmaJfalse = EcmaDisabled; +using EcmaIscoercible = EcmaDisabled; +using EcmaThrowdyn = EcmaDisabled; +using EcmaRethrowdyn = EcmaDisabled; +using EcmaReturnDyn = EcmaDisabled; +using EcmaReturnundefined = EcmaDisabled; +using EcmaCall0thisdyn = EcmaDisabled; +using EcmaCall1thisdyn = EcmaDisabled; +using EcmaCall0dyn = EcmaDisabled; +using EcmaCall1thisdyn = EcmaDisabled; +using EcmaCall1dyn = EcmaDisabled; +using EcmaCall2thisdyn = EcmaDisabled; +using EcmaCall2dyn = EcmaDisabled; +using EcmaCall3thisdyn = EcmaDisabled; +using EcmaCall3dyn = EcmaDisabled; +using EcmaCallithisrangedyn = EcmaDisabled; +using EcmaCallirangedyn = EcmaDisabled; +using EcmaCall1thisdyn = EcmaDisabled; +using EcmaCall1dyn = EcmaDisabled; +using EcmaCall2thisdyn = EcmaDisabled; +using EcmaCall2dyn = EcmaDisabled; +using EcmaCall3thisdyn = EcmaDisabled; +using EcmaCall3dyn = EcmaDisabled; +using EcmaCallithisrangedyn = EcmaDisabled; +using EcmaCallirangedyn = EcmaDisabled; +using EcmaSupercall = EcmaDisabled; +using EcmaSupercallspread = EcmaDisabled; +using EcmaNewobjdynrange = EcmaDisabled; +using EcmaLdhomeobject = EcmaDisabled; +using EcmaDefinemethod = EcmaDisabled; +using EcmaDefineasyncgeneratorfunc = EcmaDisabled; +using EcmaDefineasyncfunc = EcmaDisabled; +using EcmaDefinegeneratorfunc = EcmaDisabled; +using EcmaDefinencfuncdyn = EcmaDisabled; +using EcmaDefinefuncdyn = EcmaDisabled; +using EcmaTypeofdyn = EcmaDisabled; +using EcmaCallspreaddyn = EcmaDisabled; +using EcmaNewobjspreaddyn = EcmaDisabled; +using EcmaGetunmappedargs = EcmaDisabled; +using EcmaNegate = EcmaDisabled; +using EcmaToboolean = EcmaDisabled; +using EcmaTonumber = EcmaDisabled; +using EcmaGetmethod = EcmaDisabled; +using EcmaCreategeneratorobj = EcmaDisabled; +using EcmaCreateasyncgeneratorobj = EcmaDisabled; +using EcmaCreateiterresultobj = EcmaDisabled; +using EcmaSuspendgenerator = EcmaDisabled; +using EcmaSuspendasyncgenerator = EcmaDisabled; +using EcmaSetgeneratorstate = EcmaDisabled; +using EcmaSetgeneratorstate = EcmaDisabled; +using EcmaResumegenerator = EcmaDisabled; +using EcmaGetresumemode = EcmaDisabled; +using EcmaAsyncfunctionenter = EcmaDisabled; +using EcmaAsyncfunctionawait = EcmaDisabled; +using EcmaAsyncfunctionresolve = EcmaDisabled; +using EcmaAsyncfunctionreject = EcmaDisabled; +using EcmaAsyncgeneratorresolve = EcmaDisabled; +using EcmaAsyncgeneratorreject = EcmaDisabled; +using EcmaGettemplateobject = EcmaDisabled; +using EcmaCopyrestargs = EcmaDisabled; +using EcmaGetpropiterator = EcmaDisabled; +using EcmaGetnextpropname = EcmaDisabled; +using EcmaCreateemptyobject = EcmaDisabled; +using EcmaCreateobjectwithbuffer = EcmaDisabled; +using EcmaCreateobjecthavingmethod = EcmaDisabled; +using EcmaSetobjectwithproto = EcmaDisabled; +using EcmaCopydataproperties = EcmaDisabled; +using EcmaDefinegettersetterbyvalue = EcmaDisabled; +using EcmaCreateemptyarray = EcmaDisabled; +using EcmaCreatearraywithbuffer = EcmaDisabled; +using EcmaStarrayspread = EcmaDisabled; +using EcmaCreateregexpwithliteral = EcmaDisabled; +using EcmaThrowifnotobject = EcmaDisabled; +using EcmaThrowthrownotexists = EcmaDisabled; +using EcmaGetiterator = EcmaDisabled; +using EcmaGetasynciterator = EcmaDisabled; +using EcmaCreateobjectwithexcludedkeys = EcmaDisabled; +using EcmaThrowpatternnoncoercible = EcmaDisabled; +using EcmaCloseiterator = EcmaDisabled; +using EcmaImportmodule = EcmaDisabled; +using EcmaSetclasscomputedfields = EcmaDisabled; +using EcmaDefineclasswithbuffer = EcmaDisabled; +using EcmaLoadclasscomputedinstancefields = EcmaDisabled; +using EcmaDefineclassprivatefields = EcmaDisabled; +using EcmaClassfieldadd = EcmaDisabled; +using EcmaClassprivatefieldadd = EcmaDisabled; +using EcmaClassprivatemethodoraccessoradd = EcmaDisabled; +using EcmaClassprivatefieldget = EcmaDisabled; +using EcmaClassprivatefieldset = EcmaDisabled; +using EcmaClassprivatefieldin = EcmaDisabled; +using EcmaLdmodvarbyname = EcmaDisabled; +using EcmaStmodulevar = EcmaDisabled; +using EcmaCopymodule = EcmaDisabled; +using EcmaStsuperbyname = EcmaDisabled; +using EcmaLdsuperbyname = EcmaDisabled; +using EcmaStsuperbyvalue = EcmaDisabled; +using EcmaLdsuperbyvalue = EcmaDisabled; +using EcmaLdlexvardyn = EcmaDisabled; +using EcmaLdlexdyn = EcmaDisabled; +using EcmaStlexvardyn = EcmaDisabled; +using EcmaStlexdyn = EcmaDisabled; +using EcmaThrowifsupernotcorrectcall = EcmaDisabled; +using EcmaThrowtdz = EcmaDisabled; +using EcmaThrowconstassignment = EcmaDisabled; +using EcmaPoplexenvdyn = EcmaDisabled; +using EcmaCopylexenvdyn = EcmaDisabled; +using EcmaNewlexenvdyn = EcmaDisabled; +using EcmaLdlexenvdyn = EcmaDisabled; +using EcmaLdevalvar = EcmaDisabled; +using EcmaStevalvar = EcmaDisabled; +using EcmaLdevalbindings = EcmaDisabled; +using EcmaDirecteval = EcmaDisabled; +#endif + PandaGen::PandaGen(ArenaAllocator *const allocator, RegSpiller *const spiller, CompilerContext *const context, binder::FunctionScope *const scope, ProgramElement *const program_element) : CodeGen(allocator, spiller, context, scope, program_element) diff --git a/compiler/core/pandagen.h b/compiler/core/pandagen.h index 37e7adaf6e4337845440a930d171365707126f8a..df04670653ff0b65f37c58d5b64badbfcdc2b3fe 100644 --- a/compiler/core/pandagen.h +++ b/compiler/core/pandagen.h @@ -16,15 +16,15 @@ #ifndef ES2PANDA_COMPILER_CORE_PANDAGEN_H #define ES2PANDA_COMPILER_CORE_PANDAGEN_H -#include "plugins/ecmascript/es2panda/compiler/core/codeGen.h" -#include "plugins/ecmascript/es2panda/compiler/base/optionalChain.h" -#include "plugins/ecmascript/es2panda/compiler/core/envScope.h" -#include "plugins/ecmascript/es2panda/compiler/core/function.h" - -#include "plugins/ecmascript/es2panda/compiler/core/regAllocator.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "compiler/core/codeGen.h" +#include "compiler/base/optionalChain.h" +#include "compiler/core/envScope.h" +#include "compiler/core/function.h" + +#include "compiler/core/regAllocator.h" +#include "compiler/core/regScope.h" +#include "ir/irnode.h" +#include "lexer/token/tokenType.h" #include "macros.h" #include diff --git a/compiler/core/programElement.h b/compiler/core/programElement.h index 608b2c35b7775467c61fdc4d2179fc6e3c17c826..0fc4d3bb3239436c406d67f6e96505b847b97b3b 100644 --- a/compiler/core/programElement.h +++ b/compiler/core/programElement.h @@ -17,7 +17,7 @@ #define ES2PANDA_COMPILER_CORE_PROGRAM_ELEMENT_H #include "macros.h" -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" +#include "compiler/base/literals.h" namespace panda::pandasm { struct Ins; diff --git a/compiler/core/regAllocator.cpp b/compiler/core/regAllocator.cpp index cd667c94cb4cff04b2263f447035d94e89533696..5b7c45143fe5e66bbe853ccc52cb1edf98c9eb98 100644 --- a/compiler/core/regAllocator.cpp +++ b/compiler/core/regAllocator.cpp @@ -15,8 +15,8 @@ #include "regAllocator.h" -#include "plugins/ecmascript/es2panda/compiler/core/codeGen.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "compiler/core/codeGen.h" +#include "checker/types/type.h" #include #include diff --git a/compiler/core/regAllocator.h b/compiler/core/regAllocator.h index 569b031c71550af3dc181df7a4ceccdf0c04a071..9c7f8e46e69aacb537bc12e29db956c23d640615 100644 --- a/compiler/core/regAllocator.h +++ b/compiler/core/regAllocator.h @@ -17,7 +17,7 @@ #define ES2PANDA_COMPILER_CORE_REG_ALLOCATOR_H #include "generated/isa.h" -#include "plugins/ecmascript/es2panda/compiler/core/regSpiller.h" +#include "compiler/core/regSpiller.h" #include "macros.h" namespace panda::es2panda::ir { diff --git a/compiler/core/regScope.cpp b/compiler/core/regScope.cpp index 67f74a42be73a5ca4cad6e115853084e1038f5ca..96ff2ec599f3919d2c6be315d1c8ffea7ef85808 100644 --- a/compiler/core/regScope.cpp +++ b/compiler/core/regScope.cpp @@ -15,13 +15,13 @@ #include "regScope.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/base/hoisting.h" -#include "plugins/ecmascript/es2panda/compiler/core/codeGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/moduleContext.h" +#include "binder/binder.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "compiler/base/hoisting.h" +#include "compiler/core/codeGen.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/moduleContext.h" namespace panda::es2panda::compiler { // RegScope diff --git a/compiler/core/regScope.h b/compiler/core/regScope.h index 670af87683a5af04aa122a584243e67d4cf5b58b..deceb3d88910f76bff545f01fa72098c4c418a7d 100644 --- a/compiler/core/regScope.h +++ b/compiler/core/regScope.h @@ -17,7 +17,7 @@ #define ES2PANDA_COMPILER_CORE_REG_SCOPE_H #include "macros.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" +#include "binder/scope.h" namespace panda::es2panda::ir { class AstNode; diff --git a/compiler/core/regSpiller.cpp b/compiler/core/regSpiller.cpp index 78d7a66ff83a429d4970c38e2201aa38137484a2..a2656e5ebe710d59a69ebd4551721397b7846c5b 100644 --- a/compiler/core/regSpiller.cpp +++ b/compiler/core/regSpiller.cpp @@ -14,8 +14,8 @@ */ #include "regSpiller.h" -#include "plugins/ecmascript/es2panda/compiler/core/codeGen.h" -#include "plugins/ecmascript/es2panda/checker/types/type.h" +#include "compiler/core/codeGen.h" +#include "checker/types/type.h" namespace panda::es2panda::compiler { diff --git a/compiler/core/regSpiller.h b/compiler/core/regSpiller.h index b5f8fe87350b0e615a26f0b06bba8c5bb4a9fe78..1c2554b881ffa306d6b928119e5189d22db9ceaf 100644 --- a/compiler/core/regSpiller.h +++ b/compiler/core/regSpiller.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_CORE_REG_SPILLER_H #define ES2PANDA_COMPILER_CORE_REG_SPILLER_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" +#include "ir/irnode.h" +#include "compiler/core/regScope.h" namespace panda::es2panda::ir { class AstNode; diff --git a/compiler/core/switchBuilder.h b/compiler/core/switchBuilder.h index 5d5614dca260ddad5370631d3952630a538cff7d..aa1238c1a55bb77e2321e8177d42729dac39c2cd 100644 --- a/compiler/core/switchBuilder.h +++ b/compiler/core/switchBuilder.h @@ -16,12 +16,12 @@ #ifndef ES2PANDA_COMPILER_CORE_SWITCH_BUILDER_H #define ES2PANDA_COMPILER_CORE_SWITCH_BUILDER_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchCaseStatement.h" -#include "plugins/ecmascript/es2panda/compiler/core/dynamicContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" +#include "ir/irnode.h" +#include "ir/statements/switchStatement.h" +#include "ir/statements/switchCaseStatement.h" +#include "compiler/core/dynamicContext.h" +#include "compiler/core/ETSGen.h" +#include "checker/checker.h" namespace panda::es2panda::ir { class SwitchStatement; diff --git a/compiler/core/targetTypeContext.cpp b/compiler/core/targetTypeContext.cpp index e8c6f030dce7939c0de757499f00dee3798a8f33..55b53f9e09c24cd2878cd2c501bea2a1c8566dcd 100644 --- a/compiler/core/targetTypeContext.cpp +++ b/compiler/core/targetTypeContext.cpp @@ -15,7 +15,7 @@ #include "targetTypeContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" +#include "compiler/core/ETSGen.h" namespace panda::es2panda::compiler { TargetTypeContext::TargetTypeContext(ETSGen *etsg, const checker::Type *target_type) diff --git a/compiler/function/asyncFunctionBuilder.cpp b/compiler/function/asyncFunctionBuilder.cpp index 2faf0c8b3f6b38a215e176c2abfe2e1ed80e2514..3627b9950ce82ee618f08345468c20ea6765f8cf 100644 --- a/compiler/function/asyncFunctionBuilder.cpp +++ b/compiler/function/asyncFunctionBuilder.cpp @@ -15,9 +15,9 @@ #include "asyncFunctionBuilder.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" +#include "compiler/core/pandagen.h" +#include "compiler/base/catchTable.h" +#include "ir/base/scriptFunction.h" namespace panda::es2panda::compiler { void AsyncFunctionBuilder::DirectReturn(const ir::AstNode *node) const diff --git a/compiler/function/asyncFunctionBuilder.h b/compiler/function/asyncFunctionBuilder.h index 68b1fc63470975693a3cbf968733756be230cd01..30ce7fde23aa2a9a9e3275bbdbeb25313b15b9be 100644 --- a/compiler/function/asyncFunctionBuilder.h +++ b/compiler/function/asyncFunctionBuilder.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_FUNCTION_ASYNC_FUNCTION_BUILDER_H #define ES2PANDA_COMPILER_FUNCTION_ASYNC_FUNCTION_BUILDER_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/compiler/function/functionBuilder.h" +#include "ir/irnode.h" +#include "compiler/function/functionBuilder.h" namespace panda::es2panda::compiler { class PandaGen; diff --git a/compiler/function/asyncGeneratorFunctionBuilder.cpp b/compiler/function/asyncGeneratorFunctionBuilder.cpp index 980121c0166ff5e1b5111671dec2b8ac09081997..5ca62944f2a2e98217040cffda3c73b879d7c530 100644 --- a/compiler/function/asyncGeneratorFunctionBuilder.cpp +++ b/compiler/function/asyncGeneratorFunctionBuilder.cpp @@ -15,9 +15,9 @@ #include "asyncGeneratorFunctionBuilder.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" +#include "compiler/base/catchTable.h" +#include "compiler/core/pandagen.h" +#include "ir/base/scriptFunction.h" namespace panda::es2panda::compiler { void AsyncGeneratorFunctionBuilder::Prepare(const ir::ScriptFunction *node) const diff --git a/compiler/function/asyncGeneratorFunctionBuilder.h b/compiler/function/asyncGeneratorFunctionBuilder.h index b54af905f3d9c4076294d042903196db6a7d39a8..a2e6ca583c964cbc953aeed6251ac80f3992659b 100644 --- a/compiler/function/asyncGeneratorFunctionBuilder.h +++ b/compiler/function/asyncGeneratorFunctionBuilder.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_COMPILER_FUNCTION_ASYNC_GENERATOR_FUNCTION_BUILDER_H #define ES2PANDA_COMPILER_FUNCTION_ASYNC_GENERATOR_FUNCTION_BUILDER_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "ir/irnode.h" -#include "plugins/ecmascript/es2panda/compiler/function/asyncFunctionBuilder.h" +#include "compiler/function/asyncFunctionBuilder.h" namespace panda::es2panda::compiler { class PandaGen; diff --git a/compiler/function/functionBuilder.cpp b/compiler/function/functionBuilder.cpp index 4cb968933cdfa785bd1ce658f372f30c7bda233b..95a8ae550f7afbaceb1c1e2b9df3844ed4ea1954 100644 --- a/compiler/function/functionBuilder.cpp +++ b/compiler/function/functionBuilder.cpp @@ -15,12 +15,12 @@ #include "functionBuilder.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/compiler/base/iterators.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" +#include "binder/binder.h" +#include "util/helpers.h" +#include "ir/statement.h" +#include "ir/base/scriptFunction.h" +#include "compiler/base/iterators.h" +#include "compiler/core/pandagen.h" namespace panda::es2panda::compiler { FunctionBuilder::FunctionBuilder(PandaGen *pg, CatchTable *catch_table) diff --git a/compiler/function/functionBuilder.h b/compiler/function/functionBuilder.h index 9a69fadc1eac65b13b593ee3674d1698243013aa..9bde475c64804e84b4c4112b3aedf12cb38c5c09 100644 --- a/compiler/function/functionBuilder.h +++ b/compiler/function/functionBuilder.h @@ -17,7 +17,7 @@ #define ES2PANDA_COMPILER_FUNCTION_FUNCTION_BUILDER_H #include "macros.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "ir/irnode.h" namespace panda::es2panda::ir { class ScriptFunction; diff --git a/compiler/function/generatorFunctionBuilder.cpp b/compiler/function/generatorFunctionBuilder.cpp index 6205871db5209df3afbc5e5d71b06427ab0b4942..a75777811508b0dd0520df4b3895deeb1fb410f8 100644 --- a/compiler/function/generatorFunctionBuilder.cpp +++ b/compiler/function/generatorFunctionBuilder.cpp @@ -15,9 +15,9 @@ #include "generatorFunctionBuilder.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" +#include "compiler/core/pandagen.h" +#include "compiler/base/catchTable.h" +#include "ir/base/scriptFunction.h" namespace panda::es2panda::compiler { void GeneratorFunctionBuilder::Prepare(const ir::ScriptFunction *node) const diff --git a/compiler/function/generatorFunctionBuilder.h b/compiler/function/generatorFunctionBuilder.h index a362627cf89e4cd8c8aa06cd9c25d9a3f33bf868..429266a69c87aa7b36bc94c98432ba0a79cdd467 100644 --- a/compiler/function/generatorFunctionBuilder.h +++ b/compiler/function/generatorFunctionBuilder.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_COMPILER_FUNCTION_GENERATOR_FUNCTION_BUILDER_H #define ES2PANDA_COMPILER_FUNCTION_GENERATOR_FUNCTION_BUILDER_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" -#include "plugins/ecmascript/es2panda/compiler/function/functionBuilder.h" +#include "ir/irnode.h" +#include "compiler/function/functionBuilder.h" namespace panda::es2panda::ir { class YieldExpression; diff --git a/compiler/lowering/ets/opAssignment.cpp b/compiler/lowering/ets/opAssignment.cpp index 436657b8331882e5034d0d935a818558a216b479..77515655669213d9396c8a1a698c4bc8a7f7a9c0 100644 --- a/compiler/lowering/ets/opAssignment.cpp +++ b/compiler/lowering/ets/opAssignment.cpp @@ -25,22 +25,22 @@ */ #include "opAssignment.h" -#include "plugins/ecmascript/es2panda/checker/types/typeFlag.h" -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/compiler/lowering/util.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/opaqueTypeNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/sequenceExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsAsExpression.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "checker/types/typeFlag.h" +#include "binder/variableFlags.h" +#include "checker/ETSchecker.h" +#include "compiler/core/compilerContext.h" +#include "compiler/lowering/util.h" +#include "ir/astNode.h" +#include "ir/expression.h" +#include "ir/opaqueTypeNode.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/sequenceExpression.h" +#include "ir/statements/blockStatement.h" +#include "ir/ts/tsAsExpression.h" +#include "lexer/token/tokenType.h" namespace panda::es2panda::compiler { diff --git a/compiler/lowering/ets/opAssignment.h b/compiler/lowering/ets/opAssignment.h index dff68f56f3867628ca9777dad547694bcad62a2b..a40be1fdc3e0153996e4985ca69eb32a7ca95fba 100644 --- a/compiler/lowering/ets/opAssignment.h +++ b/compiler/lowering/ets/opAssignment.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_LOWERING_OP_ASSIGNMENT_H #define ES2PANDA_COMPILER_LOWERING_OP_ASSIGNMENT_H -#include "plugins/ecmascript/es2panda/compiler/lowering/phase.h" +#include "compiler/lowering/phase.h" namespace panda::es2panda::compiler { diff --git a/compiler/lowering/phase.cpp b/compiler/lowering/phase.cpp index 3b5d1c78dbe798108e80989452a092cbad77915b..a2a6cd89d5fd42b9fdbe7de9d28494e37aaf7ed3 100644 --- a/compiler/lowering/phase.cpp +++ b/compiler/lowering/phase.cpp @@ -14,10 +14,10 @@ */ #include "phase.h" -#include "plugins/ecmascript/es2panda/checker/checker.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" -#include "plugins/ecmascript/es2panda/compiler/lowering/ets/opAssignment.h" +#include "checker/checker.h" +#include "compiler/core/compilerContext.h" +#include "lexer/token/sourceLocation.h" +#include "compiler/lowering/ets/opAssignment.h" namespace panda::es2panda::compiler { diff --git a/compiler/lowering/phase.h b/compiler/lowering/phase.h index 39a2407745288947cf66b54fd4fb6e57ee039451..9f95bd56cf28d437c8e11570eb632a0c848123cf 100644 --- a/compiler/lowering/phase.h +++ b/compiler/lowering/phase.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_COMPILER_LOWERING_PHASE_H #define ES2PANDA_COMPILER_LOWERING_PHASE_H -#include "plugins/ecmascript/es2panda/parser/program/program.h" +#include "parser/program/program.h" namespace panda::es2panda::compiler { diff --git a/compiler/lowering/util.cpp b/compiler/lowering/util.cpp index 7aa66bbc437eec0bac3b1008674612288e643040..38bcd67f3d888ba42b30525914e7858f36fd7e47 100644 --- a/compiler/lowering/util.cpp +++ b/compiler/lowering/util.cpp @@ -15,7 +15,7 @@ #include "util.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::compiler { diff --git a/compiler/lowering/util.h b/compiler/lowering/util.h index 2d8353e17974b4fa31f3c69ec9ac7360a983bae9..8c83e7b47059bd8e22e7fc0f5f820ea1ec43dfe4 100644 --- a/compiler/lowering/util.h +++ b/compiler/lowering/util.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_COMPILER_LOWERING_UTIL_H #define ES2PANDA_COMPILER_LOWERING_UTIL_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" +#include "binder/scope.h" +#include "checker/types/ets/etsObjectType.h" +#include "ir/astNode.h" namespace panda::es2panda::compiler { diff --git a/compiler/templates/formats.h.erb b/compiler/templates/formats.h.erb index 0b8386c256f17e829fe9d0fa833d0993106accf9..bf42965e82055fec3c2ce4b8406bdd7d98283fee 100644 --- a/compiler/templates/formats.h.erb +++ b/compiler/templates/formats.h.erb @@ -24,7 +24,7 @@ #ifndef ES2PANDA_COMPILER_GEN_FORMATS_H #define ES2PANDA_COMPILER_GEN_FORMATS_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "ir/irnode.h" namespace panda::es2panda::compiler { % def get_operand_kind(op, insn) diff --git a/compiler/templates/isa.h.erb b/compiler/templates/isa.h.erb index 5a9dbbc8be1f9b66228895f1519bf0d245897537..922ceac23dd39498e1bbe62ce926b6fd7ef938ef 100644 --- a/compiler/templates/isa.h.erb +++ b/compiler/templates/isa.h.erb @@ -25,7 +25,7 @@ #ifndef ES2PANDA_COMPILER_GEN_IR_ISA_H #define ES2PANDA_COMPILER_GEN_IR_ISA_H -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "ir/irnode.h" #include "generated/formats.h" #include "assembly-ins.h" diff --git a/compiler/templates/signatures.h.erb b/compiler/templates/signatures.h.erb index 25290e57e3668c87beeb9af23669d91dee8095d2..a36d43441658dbd8f78098522eb4b0673cfecc0e 100644 --- a/compiler/templates/signatures.h.erb +++ b/compiler/templates/signatures.h.erb @@ -18,8 +18,8 @@ #ifndef ES2PANDA_COMPILER_GEN_SIGNATURES_H #define ES2PANDA_COMPILER_GEN_SIGNATURES_H -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/util/language.h" +#include "util/ustring.h" +#include "util/language.h" #include diff --git a/es2panda.cpp b/es2panda.cpp index b705fe7ad264244368a9ea65c232c155387ce064..458f00dd7b422b8a611d8d79e4f9c0ca49bf797c 100644 --- a/es2panda.cpp +++ b/es2panda.cpp @@ -15,7 +15,7 @@ #include "es2panda.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerImpl.h" +#include "compiler/core/compilerImpl.h" #include #include diff --git a/ir/as/namedType.cpp b/ir/as/namedType.cpp index 167f58e8d1ee219ffda7410ee96b86fdb3364a52..ddf8741b9d4b4ab854250ff166cc5711953d13d7 100644 --- a/ir/as/namedType.cpp +++ b/ir/as/namedType.cpp @@ -15,10 +15,10 @@ #include "namedType.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/ETSGen.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void NamedType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/as/namedType.h b/ir/as/namedType.h index 91f53dce369bcc4807eb39bd56dc7714e66c86e8..f36b79b4e3884e3b908adc372e03a9a0b5735f28 100644 --- a/ir/as/namedType.h +++ b/ir/as/namedType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_NAMED_TYPE_H #define ES2PANDA_IR_NAMED_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/as/prefixAssertionExpression.cpp b/ir/as/prefixAssertionExpression.cpp index a2921c97ad37fa09e9a06f64e042804822a04951..f5a0a0c3f3aadce902726e23758b082279e4e0d4 100644 --- a/ir/as/prefixAssertionExpression.cpp +++ b/ir/as/prefixAssertionExpression.cpp @@ -15,8 +15,8 @@ #include "prefixAssertionExpression.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { void PrefixAssertionExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/as/prefixAssertionExpression.h b/ir/as/prefixAssertionExpression.h index 5994af28c6ba25bc2a7fe719c82a5e2b462a229e..12b933d87521c30372c322a143387a533c1d6b05 100644 --- a/ir/as/prefixAssertionExpression.h +++ b/ir/as/prefixAssertionExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_PREFIX_ASSERTION_EXPRESSION_H #define ES2PANDA_IR_PREFIX_ASSERTION_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class PrefixAssertionExpression : public Expression { diff --git a/ir/astDump.cpp b/ir/astDump.cpp index e87d7497186eb92c806323bef29c0f2a0dbd1aee..dcb19eeac3c7f11473e6c373b25b7857b39e73f0 100644 --- a/ir/astDump.cpp +++ b/ir/astDump.cpp @@ -15,8 +15,8 @@ #include "astDump.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "ir/astNode.h" +#include "util/helpers.h" #include #include diff --git a/ir/astDump.h b/ir/astDump.h index e996e14b5acce23aaecfbe877559dd539063a608..4b67f6d989c6d3142cb3c87bbf58caae1bf4110a 100644 --- a/ir/astDump.h +++ b/ir/astDump.h @@ -16,11 +16,11 @@ #ifndef ES2PANDA_IR_AST_DUMP_H #define ES2PANDA_IR_AST_DUMP_H -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" -#include "plugins/ecmascript/es2panda/lexer/token/number.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/astNode.h" +#include "lexer/token/sourceLocation.h" +#include "lexer/token/tokenType.h" +#include "lexer/token/number.h" +#include "util/ustring.h" #include #include diff --git a/ir/astNode.h b/ir/astNode.h index 1013be97363533efb828561b2db3f473a363590c..496f9f8543f3d5754195f91a97ed97e0b4519406 100644 --- a/ir/astNode.h +++ b/ir/astNode.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_IR_AST_NODE_H #define ES2PANDA_IR_AST_NODE_H -#include "plugins/ecmascript/es2panda/ir/astNodeMapping.h" -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "ir/astNodeMapping.h" +#include "lexer/token/sourceLocation.h" +#include "util/enumbitops.h" #include #include "macros.h" diff --git a/ir/base/catchClause.cpp b/ir/base/catchClause.cpp index ba65a722ca1386b6b1ba0a0965b1d8f6da8a72f1..de117c4fec7a26038f01dc222dce0814e4f81c04 100644 --- a/ir/base/catchClause.cpp +++ b/ir/base/catchClause.cpp @@ -15,18 +15,18 @@ #include "catchClause.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" +#include "binder/scope.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/base/lreference.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expression.h" +#include "ir/typeNode.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/objectExpression.h" +#include "ir/statements/blockStatement.h" namespace panda::es2panda::ir { void CatchClause::TransformChildren(const NodeTransformer &cb) diff --git a/ir/base/catchClause.h b/ir/base/catchClause.h index df0e1983493e89a95f71cfc784e7e2271f9f23fc..b21e47337a740fd3451c88719faa0f0355ee986c 100644 --- a/ir/base/catchClause.h +++ b/ir/base/catchClause.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_BASE_CATCH_CLAUSE_H #define ES2PANDA_IR_BASE_CATCH_CLAUSE_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "binder/scope.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class BlockStatement; diff --git a/ir/base/classDefinition.cpp b/ir/base/classDefinition.cpp index 6eab2639eaae53b47b105b3dd68840f170a95df0..a241ee790a622135f54477806dff805de70ad05d 100644 --- a/ir/base/classDefinition.cpp +++ b/ir/base/classDefinition.cpp @@ -15,29 +15,29 @@ #include "classDefinition.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/classStaticBlock.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/nullLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsClassImplements.h" -#include "plugins/ecmascript/es2panda/ir/base/tsIndexSignature.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" +#include "util/helpers.h" +#include "binder/scope.h" +#include "compiler/base/literals.h" +#include "compiler/base/lreference.h" +#include "compiler/core/pandagen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/base/classProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/classStaticBlock.h" +#include "ir/expression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/nullLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/ts/tsClassImplements.h" +#include "ir/base/tsIndexSignature.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ts/tsTypeParameterInstantiation.h" namespace panda::es2panda::ir { const FunctionExpression *ClassDefinition::Ctor() const diff --git a/ir/base/classDefinition.h b/ir/base/classDefinition.h index d0f46864f42a4dbf072856cc628abd22bfbe85a0..408852b285ed04439b7f490434203d5946825fc7 100644 --- a/ir/base/classDefinition.h +++ b/ir/base/classDefinition.h @@ -16,11 +16,11 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_CLASS_DEFINITION_H #define ES2PANDA_PARSER_INCLUDE_AST_CLASS_DEFINITION_H -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/util/bitset.h" -#include "plugins/ecmascript/es2panda/util/language.h" +#include "ir/astNode.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "util/bitset.h" +#include "util/language.h" namespace panda::es2panda::ir { class ClassElement; diff --git a/ir/base/classElement.cpp b/ir/base/classElement.cpp index 062bd78486a94a3e2e11a765538e91533c8c8507..42e336acf5a55de4b04b2a69bb1cc8445425d3dd 100644 --- a/ir/base/classElement.cpp +++ b/ir/base/classElement.cpp @@ -15,8 +15,8 @@ #include "classElement.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "ir/base/methodDefinition.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { diff --git a/ir/base/classElement.h b/ir/base/classElement.h index 87d83e556e79e2951ccb840ecec017373e6827db..836083e64fdf75040df2273a2d4a99ae15f9d2a0 100644 --- a/ir/base/classElement.h +++ b/ir/base/classElement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_CLASS_ELEMENT_H #define ES2PANDA_PARSER_INCLUDE_AST_CLASS_ELEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/base/classProperty.cpp b/ir/base/classProperty.cpp index 1e403344c4d3ec2a33441c4d98b0f5daa7afd79a..af8d0a0c5532eb989119291d6e2f127e9c6c97ea 100644 --- a/ir/base/classProperty.cpp +++ b/ir/base/classProperty.cpp @@ -15,14 +15,14 @@ #include "classProperty.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsObjectType.h" +#include "ir/astDump.h" +#include "ir/base/decorator.h" +#include "ir/typeNode.h" +#include "ir/expression.h" +#include "ir/expressions/identifier.h" +#include "checker/ETSchecker.h" +#include "compiler/core/ETSGen.h" +#include "checker/types/ets/etsObjectType.h" #include #include diff --git a/ir/base/classProperty.h b/ir/base/classProperty.h index 829788f6072a80ab0280427c17f70b642a5b0c99..3cabe81094d5febbca3191e9617fee1ae539717f 100644 --- a/ir/base/classProperty.h +++ b/ir/base/classProperty.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_CLASS_PROPERTY_H #define ES2PANDA_PARSER_INCLUDE_AST_CLASS_PROPERTY_H -#include "plugins/ecmascript/es2panda/ir/base/classElement.h" +#include "ir/base/classElement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/base/classStaticBlock.cpp b/ir/base/classStaticBlock.cpp index 4f654a30d07dbe2f7bc4bc054be6b48699371eab..ec6476960bb9cbcaa57fe026d8790743ee186b18 100644 --- a/ir/base/classStaticBlock.cpp +++ b/ir/base/classStaticBlock.cpp @@ -15,15 +15,15 @@ #include "classStaticBlock.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "binder/scope.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/base/decorator.h" +#include "ir/base/scriptFunction.h" +#include "ir/expression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/functionExpression.h" +#include "checker/ETSchecker.h" #include #include diff --git a/ir/base/classStaticBlock.h b/ir/base/classStaticBlock.h index 1017fe1a32440b2f733fb66f03ad6acd5b37bc59..5de344109170b46a90428733759bd09ee3d53c99 100644 --- a/ir/base/classStaticBlock.h +++ b/ir/base/classStaticBlock.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_CLASS_STATIC_BLOCK_H #define ES2PANDA_PARSER_INCLUDE_AST_CLASS_STATIC_BLOCK_H -#include "plugins/ecmascript/es2panda/ir/base/classElement.h" +#include "ir/base/classElement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/base/decorator.cpp b/ir/base/decorator.cpp index 485abe8fb38485e7525b8ed99aa10d9c386eef77..8e3f9ef815082a164b0fe2fa23808f1b8476122f 100644 --- a/ir/base/decorator.cpp +++ b/ir/base/decorator.cpp @@ -15,8 +15,8 @@ #include "decorator.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/expression.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void Decorator::TransformChildren(const NodeTransformer &cb) diff --git a/ir/base/decorator.h b/ir/base/decorator.h index b955006f63e21d8a25c32267c0bf98a9ecb97eb2..ce59154e39fda8b5537e39a6536608e1d89dca9a 100644 --- a/ir/base/decorator.h +++ b/ir/base/decorator.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_DECORATOR_H #define ES2PANDA_PARSER_INCLUDE_AST_DECORATOR_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/base/metaProperty.cpp b/ir/base/metaProperty.cpp index 0976a0e638230fcec0f9057bebe3da91d62388af..c24c0a6f336ed101a07212ec79bc506804dec304 100644 --- a/ir/base/metaProperty.cpp +++ b/ir/base/metaProperty.cpp @@ -15,9 +15,9 @@ #include "metaProperty.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/pandagen.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void MetaProperty::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/base/metaProperty.h b/ir/base/metaProperty.h index a99d9df8942585075144e523976b0c0a0a6fe6fe..5054fd7fd360971a065c550fa1cdef6ef8eef7ab 100644 --- a/ir/base/metaProperty.h +++ b/ir/base/metaProperty.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_META_PROPERTY_H #define ES2PANDA_PARSER_INCLUDE_AST_META_PROPERTY_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class MetaProperty : public Expression { diff --git a/ir/base/methodDefinition.cpp b/ir/base/methodDefinition.cpp index d6074d825c3e17a73c960af41487952524be767c..7e15b36ff3e231ac9a884c1446c1d46fd146d97a 100644 --- a/ir/base/methodDefinition.cpp +++ b/ir/base/methodDefinition.cpp @@ -15,19 +15,19 @@ #include "methodDefinition.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "binder/scope.h" +#include "ir/astDump.h" +#include "ir/base/decorator.h" +#include "ir/base/classDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/expression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/typeNode.h" +#include "checker/ETSchecker.h" #include diff --git a/ir/base/methodDefinition.h b/ir/base/methodDefinition.h index 5069716403a783ad5f024fbe69fa09bc9a7f21bb..cc2b6278b859dc76e34ade90319c62cfc7946b67 100644 --- a/ir/base/methodDefinition.h +++ b/ir/base/methodDefinition.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_METHOD_DEFINITION_H #define ES2PANDA_PARSER_INCLUDE_AST_METHOD_DEFINITION_H -#include "plugins/ecmascript/es2panda/ir/base/classElement.h" +#include "ir/base/classElement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/base/property.cpp b/ir/base/property.cpp index ee0824cbe4e0afe7e9a597a336060e846dd24643..3fe13baefbef8dc15619d5c56c1574f81a7067b3 100644 --- a/ir/base/property.cpp +++ b/ir/base/property.cpp @@ -15,14 +15,14 @@ #include "property.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/validationInfo.h" +#include "ir/astDump.h" +#include "ir/expression.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/validationInfo.h" namespace panda::es2panda::ir { bool Property::ConvertibleToPatternProperty() diff --git a/ir/base/property.h b/ir/base/property.h index fb86d5271effce3f776fc1a072c50fc433e27571..d7f93c05f7af3b61c45cb1fb919e2bd3b94d7e73 100644 --- a/ir/base/property.h +++ b/ir/base/property.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_PROPERTY_H #define ES2PANDA_PARSER_INCLUDE_AST_PROPERTY_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/validationInfo.h" +#include "ir/expression.h" +#include "ir/validationInfo.h" namespace panda::es2panda::ir { enum class PropertyKind { INIT, GET, SET, PROTO }; diff --git a/ir/base/scriptFunction.cpp b/ir/base/scriptFunction.cpp index 1c555e8a1093243846527a3fe62f65e8a62b6f3a..fed743ed14e72122056d1633b4ac1874341f9257 100644 --- a/ir/base/scriptFunction.cpp +++ b/ir/base/scriptFunction.cpp @@ -15,15 +15,15 @@ #include "scriptFunction.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" +#include "binder/scope.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/expression.h" +#include "ir/typeNode.h" +#include "ir/expressions/identifier.h" +#include "ir/statements/blockStatement.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterDeclaration.h" namespace panda::es2panda::ir { bool ScriptFunction::HasBody() const diff --git a/ir/base/scriptFunction.h b/ir/base/scriptFunction.h index b5a9a23bd0d82785ca7dc6a92c57ed8a09079a28..1ac521ce356eb41c5e906d0ba9c11c50b963ae4c 100644 --- a/ir/base/scriptFunction.h +++ b/ir/base/scriptFunction.h @@ -16,10 +16,10 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_SCRIPT_FUNCTION_H #define ES2PANDA_PARSER_INCLUDE_AST_SCRIPT_FUNCTION_H -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/language.h" +#include "ir/astNode.h" +#include "binder/scope.h" +#include "util/enumbitops.h" +#include "util/language.h" namespace panda::es2panda::checker { class Signature; diff --git a/ir/base/spreadElement.cpp b/ir/base/spreadElement.cpp index 7aaaaa145170bdc634cdb76a4e5fd078910b2988..1054ba84fb2b356b8aa62ed96715a909679f9f33 100644 --- a/ir/base/spreadElement.cpp +++ b/ir/base/spreadElement.cpp @@ -15,11 +15,11 @@ #include "spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" +#include "ir/astDump.h" +#include "ir/base/decorator.h" +#include "ir/typeNode.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/objectExpression.h" namespace panda::es2panda::ir { ValidationInfo SpreadElement::ValidateExpression() diff --git a/ir/base/spreadElement.h b/ir/base/spreadElement.h index a326158a68d3bd729a67b8db5b29bfbf68980b99..5ac5fbc8eb1b5cb709869e7defd9950f7bca9bd1 100644 --- a/ir/base/spreadElement.h +++ b/ir/base/spreadElement.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_SPREAD_ELEMENT_H #define ES2PANDA_PARSER_INCLUDE_AST_SPREAD_ELEMENT_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/validationInfo.h" +#include "ir/expression.h" +#include "ir/validationInfo.h" namespace panda::es2panda::ir { class SpreadElement : public AnnotatedExpression { diff --git a/ir/base/templateElement.cpp b/ir/base/templateElement.cpp index c724198775a98dc227763e947185e09055e3d3b2..85e6e28848b67d130fb2fd25728bd535a13102cc 100644 --- a/ir/base/templateElement.cpp +++ b/ir/base/templateElement.cpp @@ -15,9 +15,9 @@ #include "templateElement.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "util/ustring.h" #include diff --git a/ir/base/templateElement.h b/ir/base/templateElement.h index ac4326c23ff2d881b8f2ac4b70119fa886cebdfb..0762e81f20d18b60469e3949632aeca87751a610 100644 --- a/ir/base/templateElement.h +++ b/ir/base/templateElement.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_TEMPLATE_ELEMENT_H #define ES2PANDA_PARSER_INCLUDE_AST_TEMPLATE_ELEMENT_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/expression.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class TemplateElement : public Expression { diff --git a/ir/base/tsIndexSignature.cpp b/ir/base/tsIndexSignature.cpp index e6482ae0ed2a3f7d96f2ad2313bbeedff115f9d6..09598d5b2488039e1ebf0c31c6900265cb77e31a 100644 --- a/ir/base/tsIndexSignature.cpp +++ b/ir/base/tsIndexSignature.cpp @@ -15,11 +15,11 @@ #include "tsIndexSignature.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { TSIndexSignature::TSIndexSignatureKind TSIndexSignature::Kind() const diff --git a/ir/base/tsIndexSignature.h b/ir/base/tsIndexSignature.h index 37da56279918296016f55f851de3988608ba372c..db29746c9150d9f768b760e68477280096771d64 100644 --- a/ir/base/tsIndexSignature.h +++ b/ir/base/tsIndexSignature.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_TS_INDEX_SIGNATURE_H #define ES2PANDA_PARSER_INCLUDE_AST_TS_INDEX_SIGNATURE_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class TSIndexSignature : public TypedAstNode { diff --git a/ir/base/tsMethodSignature.cpp b/ir/base/tsMethodSignature.cpp index b37898d6bedc7a621d122f888e377d1325c74c41..217c726b788167c2cfb87a25b5b36abaceb3b758 100644 --- a/ir/base/tsMethodSignature.cpp +++ b/ir/base/tsMethodSignature.cpp @@ -15,13 +15,13 @@ #include "tsMethodSignature.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" +#include "binder/scope.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSMethodSignature::TransformChildren(const NodeTransformer &cb) diff --git a/ir/base/tsMethodSignature.h b/ir/base/tsMethodSignature.h index 707a06e509e6d592c49184d2aef9c33aaf69d993..573cb672a910a84fabdb23ec347298abb8a10754 100644 --- a/ir/base/tsMethodSignature.h +++ b/ir/base/tsMethodSignature.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_TS_METHOD_SIGNATURE_H #define ES2PANDA_PARSER_INCLUDE_AST_TS_METHOD_SIGNATURE_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class TSTypeParameterDeclaration; diff --git a/ir/base/tsPropertySignature.cpp b/ir/base/tsPropertySignature.cpp index 1308be5b01c2a808f79db08452c3cbc51f8b5caf..3cfddf1f7fa1cb06cf888cd07f5a517fa545388e 100644 --- a/ir/base/tsPropertySignature.cpp +++ b/ir/base/tsPropertySignature.cpp @@ -15,10 +15,10 @@ #include "tsPropertySignature.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSPropertySignature::TransformChildren(const NodeTransformer &cb) diff --git a/ir/base/tsPropertySignature.h b/ir/base/tsPropertySignature.h index fe38292fe8942a8615bdfef25a99be7f047a3350..b39ebfdd0dc38b3e327f4905f11ab52012768d2f 100644 --- a/ir/base/tsPropertySignature.h +++ b/ir/base/tsPropertySignature.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_TS_PROPERTY_SIGNATURE_H #define ES2PANDA_PARSER_INCLUDE_AST_TS_PROPERTY_SIGNATURE_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TypeNode; diff --git a/ir/base/tsSignatureDeclaration.cpp b/ir/base/tsSignatureDeclaration.cpp index bdd714bf179c0e9f828991b78360b861dc2c330e..e121ff54f3f7dd46d4c6af1ec1a524223ccc068e 100644 --- a/ir/base/tsSignatureDeclaration.cpp +++ b/ir/base/tsSignatureDeclaration.cpp @@ -15,13 +15,13 @@ #include "tsSignatureDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" +#include "binder/scope.h" +#include "ir/typeNode.h" +#include "ir/astDump.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSSignatureDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/base/tsSignatureDeclaration.h b/ir/base/tsSignatureDeclaration.h index ad8fb30a3c39f1da6c7688d208760f2d473237dd..a83caebc7735372d34101495cf0be3d29bbcd771 100644 --- a/ir/base/tsSignatureDeclaration.h +++ b/ir/base/tsSignatureDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_TS_SIGNATURE_DECLARATION_H #define ES2PANDA_PARSER_INCLUDE_AST_TS_SIGNATURE_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class TSTypeParameterDeclaration; diff --git a/ir/ets/etsClassLiteral.cpp b/ir/ets/etsClassLiteral.cpp index 61bd893690a155023a2c4cf89718dd9a1170c76d..627709201d632e3be51766b0ab3712c0da7d8359 100644 --- a/ir/ets/etsClassLiteral.cpp +++ b/ir/ets/etsClassLiteral.cpp @@ -15,11 +15,11 @@ #include "etsClassLiteral.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "checker/TSchecker.h" +#include "checker/ets/typeRelationContext.h" +#include "compiler/core/ETSGen.h" namespace panda::es2panda::ir { void ETSClassLiteral::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsClassLiteral.h b/ir/ets/etsClassLiteral.h index 3caf16d8705e82e6aa07b88535a9baaf2c32d911..aa033e3bc6dac58a9522d16522eac51209a18284 100644 --- a/ir/ets/etsClassLiteral.h +++ b/ir/ets/etsClassLiteral.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_CLASS_LITERAL_H #define ES2PANDA_IR_ETS_CLASS_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { diff --git a/ir/ets/etsFunctionType.cpp b/ir/ets/etsFunctionType.cpp index c99ab4dd48ef294585e29454bf5cff5e40d29eaf..76ac886f288ed8b1b24e812e19f70db875ea478c 100644 --- a/ir/ets/etsFunctionType.cpp +++ b/ir/ets/etsFunctionType.cpp @@ -15,20 +15,20 @@ #include "etsFunctionType.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsParameterExpression.h" +#include "binder/scope.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/types/signature.h" +#include "ir/astDump.h" +#include "ir/base/spreadElement.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsInterfaceBody.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ets/etsParameterExpression.h" namespace panda::es2panda::ir { void ETSFunctionType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsFunctionType.h b/ir/ets/etsFunctionType.h index 16a2a1b410649162b56573a4e079dd0fcceec6ae..b0b0e646f5a043b879d432d5013d86adcb0b2e2e 100644 --- a/ir/ets/etsFunctionType.h +++ b/ir/ets/etsFunctionType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_FUNCTION_TYPE_H #define ES2PANDA_IR_ETS_FUNCTION_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypeParameterDeclaration; diff --git a/ir/ets/etsImportDeclaration.h b/ir/ets/etsImportDeclaration.h index be1531e540684f3e12e87ed55907f6c3c1ae7db9..9cd2390ce5c94c3dc8fd55d1ac7882911c400028 100644 --- a/ir/ets/etsImportDeclaration.h +++ b/ir/ets/etsImportDeclaration.h @@ -16,10 +16,10 @@ #ifndef ES2PANDA_IR_ETS_IMPORT_DECLARATION_H #define ES2PANDA_IR_ETS_IMPORT_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/ets/etsImportSource.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/util/language.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/ets/etsImportSource.h" +#include "ir/module/importDeclaration.h" +#include "util/language.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class StringLiteral; diff --git a/ir/ets/etsImportSource.h b/ir/ets/etsImportSource.h index 70c3654b1b3fdbc467939c96b874674d0dd890b7..f9afb603b7c6317f6108e56d77be13742d92f0f2 100644 --- a/ir/ets/etsImportSource.h +++ b/ir/ets/etsImportSource.h @@ -17,10 +17,10 @@ #ifndef ES2PANDA_IR_ETS_IMPORT_SOURCE_H #define ES2PANDA_IR_ETS_IMPORT_SOURCE_H -#include "plugins/ecmascript/es2panda/checker/types/type.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/util/language.h" +#include "checker/types/type.h" +#include "ir/astNode.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "util/language.h" namespace panda::es2panda::ir { diff --git a/ir/ets/etsLaunchExpression.cpp b/ir/ets/etsLaunchExpression.cpp index cce74e4e84558bfdb5b9facfa6751651765e5d88..49e3ff12db4c5844629021b98443939f33d09c8d 100644 --- a/ir/ets/etsLaunchExpression.cpp +++ b/ir/ets/etsLaunchExpression.cpp @@ -15,14 +15,14 @@ #include "etsLaunchExpression.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/ETSchecker.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/memberExpression.h" namespace panda::es2panda::ir { ETSLaunchExpression::ETSLaunchExpression(CallExpression *expr) diff --git a/ir/ets/etsLaunchExpression.h b/ir/ets/etsLaunchExpression.h index a0ad591311a69b2ad3379834e095d15e5753d586..245fb9704f64b887b88cc1c40112e844c0fc63cb 100644 --- a/ir/ets/etsLaunchExpression.h +++ b/ir/ets/etsLaunchExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_LAUNCH_STATEMENT_H #define ES2PANDA_IR_STATEMENT_LAUNCH_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { diff --git a/ir/ets/etsNewArrayInstanceExpression.cpp b/ir/ets/etsNewArrayInstanceExpression.cpp index d3fb7f728e9b551be60a043b3b8c15fe5d93663a..5e04482c54c86b5f219d37ef572ac2a600d63a2e 100644 --- a/ir/ets/etsNewArrayInstanceExpression.cpp +++ b/ir/ets/etsNewArrayInstanceExpression.cpp @@ -15,10 +15,10 @@ #include "etsNewArrayInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "compiler/core/ETSGen.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::ir { void ETSNewArrayInstanceExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsNewArrayInstanceExpression.h b/ir/ets/etsNewArrayInstanceExpression.h index 4d2e8638246a9bf77e7a4238a934866d4864448f..7d29085aa84b335734878c170a5aee8d1b2b7891 100644 --- a/ir/ets/etsNewArrayInstanceExpression.h +++ b/ir/ets/etsNewArrayInstanceExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_NEW_ARRAY_INSTANCE_EXPRESSION_H #define ES2PANDA_IR_ETS_NEW_ARRAY_INSTANCE_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { diff --git a/ir/ets/etsNewClassInstanceExpression.cpp b/ir/ets/etsNewClassInstanceExpression.cpp index 4d8d18df7f341fb130e9eda6d52f4a08028c1fd6..60d66c48dbf9ad9dfbd90b17f508b2a475fa19ef 100644 --- a/ir/ets/etsNewClassInstanceExpression.cpp +++ b/ir/ets/etsNewClassInstanceExpression.cpp @@ -15,18 +15,18 @@ #include "etsNewClassInstanceExpression.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" +#include "compiler/core/ETSGen.h" +#include "ir/base/classDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/astDump.h" +#include "ir/ets/etsTypeReference.h" +#include "ir/ets/etsTypeReferencePart.h" +#include "ir/expressions/identifier.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/ts/tsQualifiedName.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/types/ets/types.h" namespace panda::es2panda::ir { void ETSNewClassInstanceExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsNewClassInstanceExpression.h b/ir/ets/etsNewClassInstanceExpression.h index 0dc0721e5e7c30d66544cbf65f99575e83f526b8..739368683f27562d53318608f96a04063acdf292 100644 --- a/ir/ets/etsNewClassInstanceExpression.h +++ b/ir/ets/etsNewClassInstanceExpression.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_ETS_NEW_CLASS_INSTANCE_EXPRESSION_H #define ES2PANDA_IR_ETS_NEW_CLASS_INSTANCE_EXPRESSION_H -#include "plugins/ecmascript/es2panda/compiler/core/vReg.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "compiler/core/vReg.h" +#include "ir/expression.h" namespace panda::es2panda::checker { class Signature; diff --git a/ir/ets/etsNewMultiDimArrayInstanceExpression.cpp b/ir/ets/etsNewMultiDimArrayInstanceExpression.cpp index e3ed470523d158a993f7cbbb6b456a55d08ea101..d04ddd358e0c67ea12e15fc0614f1007c171bb22 100644 --- a/ir/ets/etsNewMultiDimArrayInstanceExpression.cpp +++ b/ir/ets/etsNewMultiDimArrayInstanceExpression.cpp @@ -15,12 +15,12 @@ #include "etsNewMultiDimArrayInstanceExpression.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "binder/ETSBinder.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "compiler/core/ETSGen.h" +#include "checker/ETSchecker.h" +#include "checker/types/signature.h" namespace panda::es2panda::ir { void ETSNewMultiDimArrayInstanceExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsNewMultiDimArrayInstanceExpression.h b/ir/ets/etsNewMultiDimArrayInstanceExpression.h index 0706500ab8b537c573b60f59b9d985e956b4a533..1cf38efa643435cccf347872aed8957b3912a35d 100644 --- a/ir/ets/etsNewMultiDimArrayInstanceExpression.h +++ b/ir/ets/etsNewMultiDimArrayInstanceExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_NEW_MULTI_DIM_ARRAY_INSTANCE_EXPRESSION_H #define ES2PANDA_IR_ETS_NEW_MULTI_DIM_ARRAY_INSTANCE_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::checker { class Signature; diff --git a/ir/ets/etsPackageDeclaration.cpp b/ir/ets/etsPackageDeclaration.cpp index 8ef739b84e75b1f85473159ceb5a676b23c074c9..cda0cbfbfc31ace7e79f0e47000f08f7d12deeb2 100644 --- a/ir/ets/etsPackageDeclaration.cpp +++ b/ir/ets/etsPackageDeclaration.cpp @@ -15,9 +15,9 @@ #include "etsPackageDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" +#include "compiler/core/ETSGen.h" namespace panda::es2panda::ir { void ETSPackageDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsPackageDeclaration.h b/ir/ets/etsPackageDeclaration.h index 909393946d1dc99cfd92824869170458d2f1d026..0a1b6a3eba28738cc44c174194252f9fd531f1c3 100644 --- a/ir/ets/etsPackageDeclaration.h +++ b/ir/ets/etsPackageDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_PACKAGE_DECLARATION_H #define ES2PANDA_IR_ETS_PACKAGE_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { diff --git a/ir/ets/etsParameterExpression.cpp b/ir/ets/etsParameterExpression.cpp index 0b049634243a77fedd392819a4477cc6c907b4f6..7e2c510ad2d2032a7a4a54dd7aded4b598808b46 100644 --- a/ir/ets/etsParameterExpression.cpp +++ b/ir/ets/etsParameterExpression.cpp @@ -15,13 +15,13 @@ #include "etsParameterExpression.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" +#include "compiler/core/pandagen.h" +#include "checker/ETSchecker.h" +#include "checker/ets/typeRelationContext.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/expressions/identifier.h" +#include "ir/base/spreadElement.h" namespace panda::es2panda::ir { diff --git a/ir/ets/etsParameterExpression.h b/ir/ets/etsParameterExpression.h index f84f6b4fcb3a46c4ce1f6c4fe93189f81fe7de52..ff1215b74df2f062c949415221b5adedd60fac8f 100644 --- a/ir/ets/etsParameterExpression.h +++ b/ir/ets/etsParameterExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_ETS_PARAMETER_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_ETS_PARAMETER_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class ETSParameterExpression : public Expression { diff --git a/ir/ets/etsPrimitiveType.cpp b/ir/ets/etsPrimitiveType.cpp index 8ec1fd8835a1ee483e78078fb3a07997b5c769b5..820b6fb5448dc8d09b2a45b200d35fd229f549cb 100644 --- a/ir/ets/etsPrimitiveType.cpp +++ b/ir/ets/etsPrimitiveType.cpp @@ -15,10 +15,10 @@ #include "etsPrimitiveType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "compiler/core/ETSGen.h" namespace panda::es2panda::ir { void ETSPrimitiveType::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ets/etsPrimitiveType.h b/ir/ets/etsPrimitiveType.h index 3e6586c112ca55b7485a5fe33ebecc6f677eacea..c8ae085f4585c41133ece704a672f1730826cc76 100644 --- a/ir/ets/etsPrimitiveType.h +++ b/ir/ets/etsPrimitiveType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_PRIMITIVE_TYPE_H #define ES2PANDA_IR_ETS_PRIMITIVE_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { enum class PrimitiveType { BYTE, INT, LONG, SHORT, FLOAT, DOUBLE, BOOLEAN, CHAR, VOID }; diff --git a/ir/ets/etsScript.h b/ir/ets/etsScript.h index 77740427f72f7a5aadaf7e703a4e0c02534221c0..2f0f35a9b1e9aa1756783b2753c50704138fbc99 100644 --- a/ir/ets/etsScript.h +++ b/ir/ets/etsScript.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_SCRIPT_H #define ES2PANDA_IR_ETS_SCRIPT_H -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" +#include "ir/statements/blockStatement.h" namespace panda::es2panda::parser { class Program; diff --git a/ir/ets/etsStructDeclaration.cpp b/ir/ets/etsStructDeclaration.cpp index e0fdc5bfe4159459804efa380c4fafafc696e324..62f8b74cdf5b9d4c5b577779dc33efa932f0d523 100644 --- a/ir/ets/etsStructDeclaration.cpp +++ b/ir/ets/etsStructDeclaration.cpp @@ -15,13 +15,13 @@ #include "etsStructDeclaration.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "compiler/base/lreference.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/base/classDefinition.h" +#include "ir/base/decorator.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { void ETSStructDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsStructDeclaration.h b/ir/ets/etsStructDeclaration.h index 21340ea1533a174bc83b1bdd41ea7bcba231c60a..7a52e9b804388b7722ac9993ddced626184610ec 100644 --- a/ir/ets/etsStructDeclaration.h +++ b/ir/ets/etsStructDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_STRUCT_DECLARATION_H #define ES2PANDA_IR_ETS_STRUCT_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class ETSStructDeclaration : public Statement { diff --git a/ir/ets/etsTypeReference.cpp b/ir/ets/etsTypeReference.cpp index a2b8bd6b5364a19a778c2e1978ef071b1e1b30c1..849f5234630df198d5d699fb7da1081ed8f802a4 100644 --- a/ir/ets/etsTypeReference.cpp +++ b/ir/ets/etsTypeReference.cpp @@ -15,11 +15,11 @@ #include "etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/ts/tsQualifiedName.h" +#include "ir/ets/etsTypeReferencePart.h" +#include "checker/ETSchecker.h" +#include "compiler/core/ETSGen.h" namespace panda::es2panda::ir { void ETSTypeReference::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsTypeReference.h b/ir/ets/etsTypeReference.h index ced1b14417fdb0450478cef4834da2a905a14e3c..17b8ef6ce1c30595a325a66579d06005fa28314c 100644 --- a/ir/ets/etsTypeReference.h +++ b/ir/ets/etsTypeReference.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_TYPE_REFERENCE_H #define ES2PANDA_IR_ETS_TYPE_REFERENCE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { diff --git a/ir/ets/etsTypeReferencePart.cpp b/ir/ets/etsTypeReferencePart.cpp index 5896d457917f2e5cc6da740808c2c344f2c42eea..4d86e09056694abe5f068f41ab938457160d3c9e 100644 --- a/ir/ets/etsTypeReferencePart.cpp +++ b/ir/ets/etsTypeReferencePart.cpp @@ -15,13 +15,13 @@ #include "etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/ets/typeRelationContext.h" +#include "compiler/core/ETSGen.h" namespace panda::es2panda::ir { void ETSTypeReferencePart::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsTypeReferencePart.h b/ir/ets/etsTypeReferencePart.h index 004aa492a374a66e78851ef098fa6e7c10111bb1..f8d82bcf2934f5df7b119ff7dd3952b6b5eca2a2 100644 --- a/ir/ets/etsTypeReferencePart.h +++ b/ir/ets/etsTypeReferencePart.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_TYPE_REFERENCE_PART_H #define ES2PANDA_IR_ETS_TYPE_REFERENCE_PART_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { diff --git a/ir/ets/etsWildcardType.cpp b/ir/ets/etsWildcardType.cpp index 755e31d1a689f6937153fb75d10ac75671b34fd7..07db87b9c6c5e99b1846269df3f178c6b0c3ee33 100644 --- a/ir/ets/etsWildcardType.cpp +++ b/ir/ets/etsWildcardType.cpp @@ -15,11 +15,11 @@ #include "etsWildcardType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/ets/etsTypeReference.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "compiler/core/ETSGen.h" namespace panda::es2panda::ir { void ETSWildcardType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ets/etsWildcardType.h b/ir/ets/etsWildcardType.h index c65d33755ea4eafd5d4645609e2c6937f38785fc..4ce8ce2adbed61728aa477c22a1d7fdec22f3a5c 100644 --- a/ir/ets/etsWildcardType.h +++ b/ir/ets/etsWildcardType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_WILDCARD_TYPE_H #define ES2PANDA_IR_ETS_WILDCARD_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { diff --git a/ir/expression.h b/ir/expression.h index a34c7c0ac3c9d53188e845e92fa398d4a1e3f336..c83f4196ed55c4bac02725cd34e4803fb887cb4b 100644 --- a/ir/expression.h +++ b/ir/expression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/astNode.h" +#include "ir/astNode.h" namespace panda::es2panda::ir { class Literal; diff --git a/ir/expressions/arrayExpression.cpp b/ir/expressions/arrayExpression.cpp index 9fc32debc72a494b297d8b3ace2dc735da4f9c89..3fc517a4607c3dcb7d972ab0db61c0b803eeaa03 100644 --- a/ir/expressions/arrayExpression.cpp +++ b/ir/expressions/arrayExpression.cpp @@ -15,21 +15,21 @@ #include "arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" -#include "plugins/ecmascript/es2panda/checker/ts/destructuringContext.h" -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" +#include "ir/base/decorator.h" +#include "util/helpers.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/ets/typeRelationContext.h" +#include "checker/ts/destructuringContext.h" +#include "compiler/base/literals.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/base/spreadElement.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/objectExpression.h" namespace panda::es2panda::ir { bool ArrayExpression::ConvertibleToArrayPattern() diff --git a/ir/expressions/arrayExpression.h b/ir/expressions/arrayExpression.h index 94da90536e218b3a49c4037d504b41926d7104a5..dd20dde06869d30b4d3bf80dc94439633c8b53a1 100644 --- a/ir/expressions/arrayExpression.h +++ b/ir/expressions/arrayExpression.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_ARRAY_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_ARRAY_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/validationInfo.h" +#include "ir/expression.h" +#include "ir/validationInfo.h" namespace panda::es2panda::ir { class ArrayExpression : public AnnotatedExpression { diff --git a/ir/expressions/arrowFunctionExpression.cpp b/ir/expressions/arrowFunctionExpression.cpp index 3c0ec1fe9d7006ed3bb8d2290be1505f0de1e28b..efe0e8f9d03fba43172eb344ce5079e14a248997 100644 --- a/ir/expressions/arrowFunctionExpression.cpp +++ b/ir/expressions/arrowFunctionExpression.cpp @@ -15,16 +15,16 @@ #include "arrowFunctionExpression.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/thisExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/thisExpression.h" +#include "ir/statements/variableDeclarator.h" +#include "checker/ETSchecker.h" +#include "checker/ets/typeRelationContext.h" namespace panda::es2panda::ir { void ArrowFunctionExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/arrowFunctionExpression.h b/ir/expressions/arrowFunctionExpression.h index db22077bf4a4254b6dbf5d106a9f89952a822d09..5bcefdb81bafc68f1657f7ef856caeb730c6276c 100644 --- a/ir/expressions/arrowFunctionExpression.h +++ b/ir/expressions/arrowFunctionExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_ARROW_FUNCTION_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_ARROW_FUNCTION_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class ScriptFunction; diff --git a/ir/expressions/assignmentExpression.cpp b/ir/expressions/assignmentExpression.cpp index af8ec68d11a180a3e44e18f9372ad020b106c52a..55dddea59c6617d026f441ae7064b10c8056a91f 100644 --- a/ir/expressions/assignmentExpression.cpp +++ b/ir/expressions/assignmentExpression.cpp @@ -15,21 +15,21 @@ #include "assignmentExpression.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" - -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ts/destructuringContext.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" +#include "compiler/base/lreference.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/regScope.h" +#include "ir/astDump.h" +#include "ir/base/spreadElement.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/memberExpression.h" + +#include "checker/TSchecker.h" +#include "checker/ts/destructuringContext.h" +#include "checker/ets/typeRelationContext.h" namespace panda::es2panda::ir { bool AssignmentExpression::ConvertibleToAssignmentPattern(bool must_be_pattern) diff --git a/ir/expressions/assignmentExpression.h b/ir/expressions/assignmentExpression.h index 1676b304c777be2f071385a05a52366cc8442f3a..f3a90f2291295994d01a56b546ad76f28d62030d 100644 --- a/ir/expressions/assignmentExpression.h +++ b/ir/expressions/assignmentExpression.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_ASSIGNMENT_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_ASSIGNMENT_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "ir/expression.h" +#include "lexer/token/tokenType.h" namespace panda::es2panda::ir { class AssignmentExpression : public Expression { diff --git a/ir/expressions/awaitExpression.cpp b/ir/expressions/awaitExpression.cpp index fc66c969601849963a0eb9299cb7bcadc2f426cc..f94109b4bee0d35444891f6683f994997dfd0aad 100644 --- a/ir/expressions/awaitExpression.cpp +++ b/ir/expressions/awaitExpression.cpp @@ -15,15 +15,15 @@ #include "awaitExpression.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrowFunctionExpression.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/regScope.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/arrowFunctionExpression.h" namespace panda::es2panda::ir { void AwaitExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/awaitExpression.h b/ir/expressions/awaitExpression.h index 92e0a9ad7dbdcecd608ab17de731e0badde5a9db..25f849047f6028ec78c612673c85a496abdb592c 100644 --- a/ir/expressions/awaitExpression.h +++ b/ir/expressions/awaitExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_AWAIT_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_AWAIT_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class AwaitExpression : public Expression { diff --git a/ir/expressions/binaryExpression.cpp b/ir/expressions/binaryExpression.cpp index c96b56b34609868829bc6a3c214f6c789794857d..90ac4517d38ee11a5e8cadfb599df367a94ba413 100644 --- a/ir/expressions/binaryExpression.cpp +++ b/ir/expressions/binaryExpression.cpp @@ -15,16 +15,16 @@ #include "binaryExpression.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/core/function.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "binder/variable.h" +#include "compiler/core/function.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/regScope.h" +#include "checker/ETSchecker.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "lexer/token/tokenType.h" namespace panda::es2panda::ir { void BinaryExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/binaryExpression.h b/ir/expressions/binaryExpression.h index 05243c3a6800d3e6c2f13a57967f34de40c5166e..d382279d81c7767325b9192b1092d1d94a3a9d3d 100644 --- a/ir/expressions/binaryExpression.h +++ b/ir/expressions/binaryExpression.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_BINARY_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_BINARY_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "ir/expression.h" +#include "lexer/token/tokenType.h" namespace panda::es2panda::ir { class BinaryExpression : public Expression { diff --git a/ir/expressions/callExpression.cpp b/ir/expressions/callExpression.cpp index c65a6deb9811c9f8d9028f0a0ac51126b9b8f35b..3537218a8b79caff21171feaeb699f45e28b6dad 100644 --- a/ir/expressions/callExpression.cpp +++ b/ir/expressions/callExpression.cpp @@ -15,27 +15,27 @@ #include "callExpression.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/compiler/core/function.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsDynamicFunctionType.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/objectType.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/expressions/chainExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrowFunctionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" +#include "util/helpers.h" +#include "compiler/core/function.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/regScope.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/types/ets/etsDynamicFunctionType.h" +#include "checker/types/ts/objectType.h" +#include "checker/types/signature.h" +#include "ir/base/scriptFunction.h" +#include "ir/astDump.h" +#include "ir/ets/etsFunctionType.h" +#include "ir/expressions/chainExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/arrowFunctionExpression.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/statements/blockStatement.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "ir/ts/tsEnumMember.h" namespace panda::es2panda::ir { void CallExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/callExpression.h b/ir/expressions/callExpression.h index 323cc8d1e90fce6239593e437742b8d67d2bf61d..0628232a565ecbf8997b32ecef10404a587613c1 100644 --- a/ir/expressions/callExpression.h +++ b/ir/expressions/callExpression.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_CALL_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_CALL_EXPRESSION_H -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "binder/variable.h" +#include "ir/expression.h" namespace panda::es2panda::checker { class Signature; diff --git a/ir/expressions/chainExpression.cpp b/ir/expressions/chainExpression.cpp index 1b453fb1c8ae39566736cf74f9a431e4fe32dc96..7a6eeb4e3c07ee18617f93d75fa7e8a221866046 100644 --- a/ir/expressions/chainExpression.cpp +++ b/ir/expressions/chainExpression.cpp @@ -15,12 +15,12 @@ #include "chainExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/compiler/base/optionalChain.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/memberExpression.h" +#include "compiler/base/optionalChain.h" +#include "compiler/core/regScope.h" +#include "compiler/core/pandagen.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void ChainExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/chainExpression.h b/ir/expressions/chainExpression.h index 7fe1a059d69dd98a4d9f7088f98f838ec7313e58..f1690d0934d2a32c058136b4d748b449df839546 100644 --- a/ir/expressions/chainExpression.h +++ b/ir/expressions/chainExpression.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_CHAIN_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_CHAIN_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "ir/expression.h" +#include "ir/irnode.h" namespace panda::es2panda::ir { class ChainExpression : public Expression { diff --git a/ir/expressions/classExpression.cpp b/ir/expressions/classExpression.cpp index 0dd6f2f640e67ebdc85c55653efd90bd0ee04fa3..ecefc3a8faa98819a7af97b4a76a6d32be7280c2 100644 --- a/ir/expressions/classExpression.cpp +++ b/ir/expressions/classExpression.cpp @@ -15,8 +15,8 @@ #include "classExpression.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" +#include "ir/astDump.h" +#include "ir/base/classDefinition.h" namespace panda::es2panda::ir { void ClassExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/classExpression.h b/ir/expressions/classExpression.h index 4a368226c124439de92c13991bd887de2de91ca3..1ab8e4a09cef41e69b7982dadee50bf1f4d269bb 100644 --- a/ir/expressions/classExpression.h +++ b/ir/expressions/classExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_CLASS_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_CLASS_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class ClassDefinition; diff --git a/ir/expressions/conditionalExpression.cpp b/ir/expressions/conditionalExpression.cpp index 0504f3616512c7de1851dfd455d083d94dacf2bd..245e6845a750df83ee4c7404d6273628d55f99ba 100644 --- a/ir/expressions/conditionalExpression.cpp +++ b/ir/expressions/conditionalExpression.cpp @@ -15,11 +15,11 @@ #include "conditionalExpression.h" -#include "plugins/ecmascript/es2panda/compiler/base/condition.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/base/condition.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void ConditionalExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/conditionalExpression.h b/ir/expressions/conditionalExpression.h index 52d3dadb21847b30335b298c365d52c87853f3ee..e18aad50e899ec896d3208bcca2fc0d192ef46ef 100644 --- a/ir/expressions/conditionalExpression.h +++ b/ir/expressions/conditionalExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_CONDITIONAL_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_CONDITIONAL_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class ConditionalExpression : public Expression { diff --git a/ir/expressions/directEvalExpression.cpp b/ir/expressions/directEvalExpression.cpp index 039a4de07aa930c06ccc98a45bc7eba3c40339bf..356301fb15468c40b02608ae59669c30bd649465 100644 --- a/ir/expressions/directEvalExpression.cpp +++ b/ir/expressions/directEvalExpression.cpp @@ -17,9 +17,9 @@ #include "directEvalExpression.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" +#include "util/helpers.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/regScope.h" namespace panda::es2panda::ir { void DirectEvalExpression::Compile(compiler::PandaGen *pg) const diff --git a/ir/expressions/directEvalExpression.h b/ir/expressions/directEvalExpression.h index 85fb38c53cfab847ce8bb2aa247c12ed42003319..0e62ab53e8d1ec79b74e4b868823fd62b44997aa 100644 --- a/ir/expressions/directEvalExpression.h +++ b/ir/expressions/directEvalExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_DIRECT_EVAL_H #define ES2PANDA_IR_EXPRESSION_DIRECT_EVAL_H -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" +#include "ir/expressions/callExpression.h" namespace panda::es2panda::ir { class DirectEvalExpression : public CallExpression { diff --git a/ir/expressions/functionExpression.cpp b/ir/expressions/functionExpression.cpp index aff15d3f8495fe179fffad6220a01fb56789d2a8..6800ae4017f7e7c745fa1d14e317beaa631063b3 100644 --- a/ir/expressions/functionExpression.cpp +++ b/ir/expressions/functionExpression.cpp @@ -15,13 +15,13 @@ #include "functionExpression.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" +#include "ir/statements/variableDeclarator.h" namespace panda::es2panda::ir { void FunctionExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/functionExpression.h b/ir/expressions/functionExpression.h index ca8a7933e1cdc64c15c2ca21b589953a12891d8b..4b2191857876d40e841c41400d5ce63f5f3de283 100644 --- a/ir/expressions/functionExpression.h +++ b/ir/expressions/functionExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_FUNCTION_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_FUNCTION_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class ScriptFunction; diff --git a/ir/expressions/identifier.cpp b/ir/expressions/identifier.cpp index d3ddf5904549950822a4c19cf8189687a29c0791..fd9d7fed6015936ed712ea3a1ce668684489752a 100644 --- a/ir/expressions/identifier.cpp +++ b/ir/expressions/identifier.cpp @@ -15,15 +15,15 @@ #include "identifier.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "binder/scope.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/base/decorator.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void Identifier::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/identifier.h b/ir/expressions/identifier.h index 9f7a13050abc2f08e729bb0880912b1357928051..212db72e8728afee84a3ff8f7423baa469043c40 100644 --- a/ir/expressions/identifier.h +++ b/ir/expressions/identifier.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_IR_EXPRESSION_IDENTIFIER_H #define ES2PANDA_IR_EXPRESSION_IDENTIFIER_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/ir/validationInfo.h" +#include "ir/expression.h" +#include "util/ustring.h" +#include "ir/validationInfo.h" namespace panda::es2panda::binder { class Variable; diff --git a/ir/expressions/importExpression.cpp b/ir/expressions/importExpression.cpp index 4dce7d514f93948a056c6b8ad9445c65ad911079..3f4457974b218e6a595db6eae2bc8602d4384611 100644 --- a/ir/expressions/importExpression.cpp +++ b/ir/expressions/importExpression.cpp @@ -15,8 +15,8 @@ #include "importExpression.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/pandagen.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void ImportExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/importExpression.h b/ir/expressions/importExpression.h index 1777395417ac751af71e015361b53748629e3d1b..0fd5bdc736157013fe7773600386e110e2f89ebd 100644 --- a/ir/expressions/importExpression.h +++ b/ir/expressions/importExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_IMPORT_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_IMPORT_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class ImportExpression : public Expression { diff --git a/ir/expressions/literal.h b/ir/expressions/literal.h index c9f4437be9d6c9703def00d40fd42af318aef2dd..90c816d2d8e5cce1da79c2f657e6f9e194997aa7 100644 --- a/ir/expressions/literal.h +++ b/ir/expressions/literal.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_LITERAL_H #define ES2PANDA_IR_EXPRESSION_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class Literal : public Expression { diff --git a/ir/expressions/literals/bigIntLiteral.cpp b/ir/expressions/literals/bigIntLiteral.cpp index abbf12ef6cfcecfd85b75697abbfe5da2b9d297e..5d5057d7a86c175f01ab8cd79e525dac256a39e5 100644 --- a/ir/expressions/literals/bigIntLiteral.cpp +++ b/ir/expressions/literals/bigIntLiteral.cpp @@ -15,9 +15,9 @@ #include "bigIntLiteral.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/pandagen.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void BigIntLiteral::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/expressions/literals/bigIntLiteral.h b/ir/expressions/literals/bigIntLiteral.h index a0cf511872775c2242c0d6daf62748a35f7a096f..bed945f6057df6cea3d37255dcb631a16121b35c 100644 --- a/ir/expressions/literals/bigIntLiteral.h +++ b/ir/expressions/literals/bigIntLiteral.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_LITERAL_BIGINT_LITERAL_H #define ES2PANDA_IR_EXPRESSION_LITERAL_BIGINT_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/expressions/literal.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/expressions/literal.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class BigIntLiteral : public Literal { diff --git a/ir/expressions/literals/booleanLiteral.cpp b/ir/expressions/literals/booleanLiteral.cpp index e86344961c500725d42fbdd85f464220e6a836d7..7d7308804cecccc75017f75ab40590f0834223a9 100644 --- a/ir/expressions/literals/booleanLiteral.cpp +++ b/ir/expressions/literals/booleanLiteral.cpp @@ -15,11 +15,11 @@ #include "booleanLiteral.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void BooleanLiteral::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/expressions/literals/booleanLiteral.h b/ir/expressions/literals/booleanLiteral.h index 3a270c77da4765e36c7b64c156e2ec2c56b3da39..7618f0740bd4cf512d177446066a06a238ae7985 100644 --- a/ir/expressions/literals/booleanLiteral.h +++ b/ir/expressions/literals/booleanLiteral.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_LITERAL_BOOLEAN_LITERAL_H #define ES2PANDA_IR_EXPRESSION_LITERAL_BOOLEAN_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/expressions/literal.h" +#include "ir/expressions/literal.h" namespace panda::es2panda::ir { class BooleanLiteral : public Literal { diff --git a/ir/expressions/literals/charLiteral.cpp b/ir/expressions/literals/charLiteral.cpp index 45ba935d63eeeae68815197f36e7b494b8e5015e..d994897746d5280a1f4c987ed0aec81be3d72156 100644 --- a/ir/expressions/literals/charLiteral.cpp +++ b/ir/expressions/literals/charLiteral.cpp @@ -15,10 +15,10 @@ #include "charLiteral.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" #include diff --git a/ir/expressions/literals/charLiteral.h b/ir/expressions/literals/charLiteral.h index 4bc24a0a2b5c6deac3edca2d830a68dd42ff358d..f46b8285531761ed053b7996aa2f993788905df7 100644 --- a/ir/expressions/literals/charLiteral.h +++ b/ir/expressions/literals/charLiteral.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_LITERAL_CHAR_LITERAL_H #define ES2PANDA_IR_EXPRESSION_LITERAL_CHAR_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/expressions/literal.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/expressions/literal.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class CharLiteral : public Literal { diff --git a/ir/expressions/literals/nullLiteral.cpp b/ir/expressions/literals/nullLiteral.cpp index 5d0dd6605737b69601ded05f8a8b138a67b7cdf2..dba69d293af739b4326add8427e3e8563a11c48c 100644 --- a/ir/expressions/literals/nullLiteral.cpp +++ b/ir/expressions/literals/nullLiteral.cpp @@ -15,11 +15,11 @@ #include "nullLiteral.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void NullLiteral::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/expressions/literals/nullLiteral.h b/ir/expressions/literals/nullLiteral.h index b42f25a234fb091f5dc3cfb0edda2fb75fe05640..cce639f05b0a5ded86ff91036f47625aadea35d4 100644 --- a/ir/expressions/literals/nullLiteral.h +++ b/ir/expressions/literals/nullLiteral.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_LITERAL_NULL_LITERAL_H #define ES2PANDA_IR_EXPRESSION_LITERAL_NULL_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/expressions/literal.h" +#include "ir/expressions/literal.h" namespace panda::es2panda::ir { class NullLiteral : public Literal { diff --git a/ir/expressions/literals/numberLiteral.cpp b/ir/expressions/literals/numberLiteral.cpp index f9befce00188ec8e3e269d47f72369a48866469e..e9f35b277c2bb33833b06f8cd5d59b39c28958da 100644 --- a/ir/expressions/literals/numberLiteral.cpp +++ b/ir/expressions/literals/numberLiteral.cpp @@ -15,12 +15,12 @@ #include "numberLiteral.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "util/helpers.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void NumberLiteral::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/expressions/literals/numberLiteral.h b/ir/expressions/literals/numberLiteral.h index ac01f2d51525b52b8ba0056a650a8d2647a77f07..abe228d2216d60359176f285a61b6a2f12bd5e4a 100644 --- a/ir/expressions/literals/numberLiteral.h +++ b/ir/expressions/literals/numberLiteral.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_IR_EXPRESSION_LITERAL_NUMBER_LITERAL_H #define ES2PANDA_IR_EXPRESSION_LITERAL_NUMBER_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/expressions/literal.h" -#include "plugins/ecmascript/es2panda/lexer/token/number.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/expressions/literal.h" +#include "lexer/token/number.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class NumberLiteral : public Literal { diff --git a/ir/expressions/literals/regExpLiteral.cpp b/ir/expressions/literals/regExpLiteral.cpp index 790f69028a65e128b27ac1ed5fa7f94701ac30cb..90d9cacda6fc2b522512ca686d1b8170a004e84b 100644 --- a/ir/expressions/literals/regExpLiteral.cpp +++ b/ir/expressions/literals/regExpLiteral.cpp @@ -15,11 +15,11 @@ #include "regExpLiteral.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "binder/variable.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/regScope.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void RegExpLiteral::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/expressions/literals/regExpLiteral.h b/ir/expressions/literals/regExpLiteral.h index c2dd8c6080dfd78a34d5c14738364d1762764705..d5e50c559ec02bbe2135eae5d5dc670bd0a9e2d9 100644 --- a/ir/expressions/literals/regExpLiteral.h +++ b/ir/expressions/literals/regExpLiteral.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_IR_EXPRESSION_LITERAL_REGEXP_LITERAL_H #define ES2PANDA_IR_EXPRESSION_LITERAL_REGEXP_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/expressions/literal.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/lexer/regexp/regexp.h" +#include "ir/expressions/literal.h" +#include "util/ustring.h" +#include "lexer/regexp/regexp.h" namespace panda::es2panda::ir { class RegExpLiteral : public Literal { diff --git a/ir/expressions/literals/stringLiteral.cpp b/ir/expressions/literals/stringLiteral.cpp index edc664938cbab09f0b5a10abf1ee1741b476e06f..0a8bbaeb3be3e89688a50420bcfa5c384e9df611 100644 --- a/ir/expressions/literals/stringLiteral.cpp +++ b/ir/expressions/literals/stringLiteral.cpp @@ -15,11 +15,11 @@ #include "stringLiteral.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" #include diff --git a/ir/expressions/literals/stringLiteral.h b/ir/expressions/literals/stringLiteral.h index d4ec0b386958cd02ea2601ab3aa049f4ea9f7e0b..593108b1b2931451ab11295dc6d083e4653794e5 100644 --- a/ir/expressions/literals/stringLiteral.h +++ b/ir/expressions/literals/stringLiteral.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_LITERAL_STRING_LITERAL_H #define ES2PANDA_IR_EXPRESSION_LITERAL_STRING_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/expressions/literal.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/expressions/literal.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class StringLiteral : public Literal { diff --git a/ir/expressions/memberExpression.cpp b/ir/expressions/memberExpression.cpp index 721ed506926971a950463f23ff70c2ed16b4d883..4fbd441462ca2898d5fb46130c52ecc8340d3818 100644 --- a/ir/expressions/memberExpression.cpp +++ b/ir/expressions/memberExpression.cpp @@ -15,21 +15,21 @@ #include "memberExpression.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/function.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/function.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/types/signature.h" +#include "ir/astDump.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/ts/tsEnumMember.h" +#include "util/helpers.h" namespace panda::es2panda::ir { bool MemberExpression::IsPrivateReference() const diff --git a/ir/expressions/memberExpression.h b/ir/expressions/memberExpression.h index 5de9263418ceff228957321d6d7fc30494ce9f6d..cb044f95ba88ad1008fd12c99f00e02c5751ef2a 100644 --- a/ir/expressions/memberExpression.h +++ b/ir/expressions/memberExpression.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_IR_EXPRESSION_MEMBER_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_MEMBER_EXPRESSION_H -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/irnode.h" +#include "binder/variable.h" +#include "ir/expression.h" +#include "ir/irnode.h" namespace panda::es2panda::checker { class ETSObjectType; diff --git a/ir/expressions/newExpression.cpp b/ir/expressions/newExpression.cpp index 2d89a1b783b71847257e597fa4daf0c5ae3eab11..6795ae44be6d27f7727a7fdd4053e2a2b35f3080 100644 --- a/ir/expressions/newExpression.cpp +++ b/ir/expressions/newExpression.cpp @@ -15,12 +15,12 @@ #include "newExpression.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "util/helpers.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/regScope.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void NewExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/newExpression.h b/ir/expressions/newExpression.h index 38d3f6593f204da82556062e04a56fe43b1bbf78..46d7e08f624ab8c99179994f4fc9b9a8b068e1da 100644 --- a/ir/expressions/newExpression.h +++ b/ir/expressions/newExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_NEW_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_NEW_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class NewExpression : public Expression { diff --git a/ir/expressions/objectExpression.cpp b/ir/expressions/objectExpression.cpp index 1c2f85681df7954229b30aef184155dcc4dd0b03..2dadceaa0f01e65d69a403241fc5e1d1e9f72f73 100644 --- a/ir/expressions/objectExpression.cpp +++ b/ir/expressions/objectExpression.cpp @@ -15,33 +15,33 @@ #include "objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" -#include "plugins/ecmascript/es2panda/checker/ts/destructuringContext.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewClassInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/nullLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/validationInfo.h" -#include "plugins/ecmascript/es2panda/util/bitset.h" +#include "ir/base/decorator.h" +#include "util/helpers.h" +#include "compiler/base/literals.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/ets/typeRelationContext.h" +#include "checker/ts/destructuringContext.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/base/property.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/spreadElement.h" +#include "ir/ets/etsTypeReference.h" +#include "ir/ets/etsTypeReferencePart.h" +#include "ir/ets/etsNewClassInstanceExpression.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/nullLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/validationInfo.h" +#include "util/bitset.h" namespace panda::es2panda::ir { ValidationInfo ObjectExpression::ValidateExpression() diff --git a/ir/expressions/objectExpression.h b/ir/expressions/objectExpression.h index d3aa4d5c161ab9e9cff83cd14966643c2c6602bb..16d2566a10c1a85f3b19d09a4a3d93e098f80ef6 100644 --- a/ir/expressions/objectExpression.h +++ b/ir/expressions/objectExpression.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_IR_EXPRESSION_OBJECT_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_OBJECT_EXPRESSION_H -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/validationInfo.h" +#include "binder/variable.h" +#include "ir/expression.h" +#include "ir/validationInfo.h" namespace panda::es2panda::util { class BitSet; diff --git a/ir/expressions/omittedExpression.cpp b/ir/expressions/omittedExpression.cpp index 56a99b9cb1eda02465a870fb892e421043af3356..20da88710098a79b211dad4832d4fdc9d289aba2 100644 --- a/ir/expressions/omittedExpression.cpp +++ b/ir/expressions/omittedExpression.cpp @@ -15,8 +15,8 @@ #include "omittedExpression.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void OmittedExpression::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/expressions/omittedExpression.h b/ir/expressions/omittedExpression.h index f4e812f51408418c9631a4b7d851972c9f4caf6d..82dddab34e49a135ff0f800a88010925c95099e6 100644 --- a/ir/expressions/omittedExpression.h +++ b/ir/expressions/omittedExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_OMITTED_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_OMITTED_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class OmittedExpression : public Expression { diff --git a/ir/expressions/sequenceExpression.cpp b/ir/expressions/sequenceExpression.cpp index e86b41736f80f823574cc17748da8fd93a72b737..34be758d51469fba75b95d81a732c7c4dadf03c3 100644 --- a/ir/expressions/sequenceExpression.cpp +++ b/ir/expressions/sequenceExpression.cpp @@ -15,8 +15,8 @@ #include "sequenceExpression.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void SequenceExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/sequenceExpression.h b/ir/expressions/sequenceExpression.h index 36cd77d3f7bd5e87c24ed2b440562ed46f8a5223..1009f46818936f3de526329edb67cc0b9cdbc824 100644 --- a/ir/expressions/sequenceExpression.h +++ b/ir/expressions/sequenceExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_SEQUENCE_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_SEQUENCE_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class SequenceExpression : public Expression { diff --git a/ir/expressions/superExpression.cpp b/ir/expressions/superExpression.cpp index c5c9a2ed258c0b3937c47a26c27ebb47c29fde98..4915f5617615adb696cc92de0ce8577c32b1d812 100644 --- a/ir/expressions/superExpression.cpp +++ b/ir/expressions/superExpression.cpp @@ -15,12 +15,12 @@ #include "superExpression.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "util/helpers.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void SuperExpression::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/expressions/superExpression.h b/ir/expressions/superExpression.h index a2e8a0ef4f9ee145675119d9182bbb894ad8844c..ca9976d332bd5885d3852ad301789a658803c701 100644 --- a/ir/expressions/superExpression.h +++ b/ir/expressions/superExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_SUPER_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_SUPER_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class SuperExpression : public Expression { diff --git a/ir/expressions/taggedTemplateExpression.cpp b/ir/expressions/taggedTemplateExpression.cpp index 40b5b0fa610ef4a78c83176070a840c795633228..dfa24a9d06c53c2aca4dba094247a4f9f6761102 100644 --- a/ir/expressions/taggedTemplateExpression.cpp +++ b/ir/expressions/taggedTemplateExpression.cpp @@ -15,15 +15,15 @@ #include "taggedTemplateExpression.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/templateLiteral.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" +#include "binder/variable.h" +#include "compiler/base/literals.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/regScope.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/templateLiteral.h" +#include "ir/ts/tsTypeParameterInstantiation.h" namespace panda::es2panda::ir { void TaggedTemplateExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/taggedTemplateExpression.h b/ir/expressions/taggedTemplateExpression.h index 9daf0e56ac9e8d2a588361cb7d2b12b681519990..69f85a768a7968f464db474dd9b1810dc42854a5 100644 --- a/ir/expressions/taggedTemplateExpression.h +++ b/ir/expressions/taggedTemplateExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_TAGGED_TEMPLATE_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_TAGGED_TEMPLATE_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TemplateLiteral; diff --git a/ir/expressions/templateLiteral.cpp b/ir/expressions/templateLiteral.cpp index 35332dc27154b5c4383930ab59f8d73c0e0cfa7f..1fb16fcea04f12b78b2133d8c11d315d74aaa064 100644 --- a/ir/expressions/templateLiteral.cpp +++ b/ir/expressions/templateLiteral.cpp @@ -15,12 +15,12 @@ #include "templateLiteral.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/templateElement.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/base/templateElement.h" namespace panda::es2panda::ir { void TemplateLiteral::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/templateLiteral.h b/ir/expressions/templateLiteral.h index 784f40f462fb6b45f444bd8c0d2e000c1397de58..e8091c7d9edcd6b19877b3eafd217f629c64e36f 100644 --- a/ir/expressions/templateLiteral.h +++ b/ir/expressions/templateLiteral.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_PARSER_INCLUDE_AST_TEMPLATE_LITERAL_H #define ES2PANDA_PARSER_INCLUDE_AST_TEMPLATE_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/base/templateElement.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/base/templateElement.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TemplateLiteral : public Expression { diff --git a/ir/expressions/thisExpression.cpp b/ir/expressions/thisExpression.cpp index 808aa42ccaaf60b8e10300a118c7a260ed17b53f..af908299c63684b72a65f7eda99b44c19add315d 100644 --- a/ir/expressions/thisExpression.cpp +++ b/ir/expressions/thisExpression.cpp @@ -15,18 +15,18 @@ #include "thisExpression.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" +#include "util/helpers.h" +#include "binder/binder.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/base/classDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/methodDefinition.h" +#include "ir/statements/blockStatement.h" +#include "ir/astDump.h" +#include "ir/expressions/callExpression.h" namespace panda::es2panda::ir { void ThisExpression::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/expressions/thisExpression.h b/ir/expressions/thisExpression.h index 3172afa0ee6f8898cf0735d493ed563c20a48b0f..12ac04921e81a3718eb36314c31d6a98182edfbb 100644 --- a/ir/expressions/thisExpression.h +++ b/ir/expressions/thisExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_THIS_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_THIS_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class ThisExpression : public Expression { diff --git a/ir/expressions/unaryExpression.cpp b/ir/expressions/unaryExpression.cpp index 9a43b7c4d1c1666324d7a6d0b45cc6200addd616..082482bef176e53073d18d54d31ba6c0977e7efe 100644 --- a/ir/expressions/unaryExpression.cpp +++ b/ir/expressions/unaryExpression.cpp @@ -15,16 +15,16 @@ #include "unaryExpression.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/bigIntLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" +#include "binder/variable.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/bigIntLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/memberExpression.h" namespace panda::es2panda::ir { void UnaryExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/unaryExpression.h b/ir/expressions/unaryExpression.h index 8760d9dc9b1e5972b8eebcbf5eb92b212cf12bbb..611fc7f1b7ac1f45e83c71c6bd2d15e8df321522 100644 --- a/ir/expressions/unaryExpression.h +++ b/ir/expressions/unaryExpression.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_UNARY_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_UNARY_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "ir/expression.h" +#include "lexer/token/tokenType.h" namespace panda::es2panda::compiler { class PandaGen; diff --git a/ir/expressions/updateExpression.cpp b/ir/expressions/updateExpression.cpp index 9b141ee6c1514577d07a36ff742b91758866b40e..52a4ab4ca763325bdfe947c61d15766c0e13a2bd 100644 --- a/ir/expressions/updateExpression.cpp +++ b/ir/expressions/updateExpression.cpp @@ -15,17 +15,17 @@ #include "updateExpression.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/unaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" +#include "binder/variable.h" +#include "compiler/base/lreference.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/regScope.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/expressions/unaryExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/memberExpression.h" namespace panda::es2panda::ir { void UpdateExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/updateExpression.h b/ir/expressions/updateExpression.h index aaeb23f6b7a859c61f5bf0420fe757736760ebbf..27ec06eaae39e9ef41aedccca78319358778edbd 100644 --- a/ir/expressions/updateExpression.h +++ b/ir/expressions/updateExpression.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_EXPRESSION_UPDATE_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_UPDATE_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "ir/expression.h" +#include "lexer/token/tokenType.h" namespace panda::es2panda::ir { class UpdateExpression : public Expression { diff --git a/ir/expressions/yieldExpression.cpp b/ir/expressions/yieldExpression.cpp index 64b24b3b383e1716e65044d09d207cbd86215154..0d4d22fe043d0ef8c7c02faf320859b1917b7413 100644 --- a/ir/expressions/yieldExpression.cpp +++ b/ir/expressions/yieldExpression.cpp @@ -15,10 +15,10 @@ #include "yieldExpression.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/function/generatorFunctionBuilder.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/pandagen.h" +#include "compiler/function/generatorFunctionBuilder.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void YieldExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/expressions/yieldExpression.h b/ir/expressions/yieldExpression.h index d500b094937eb41cb3a099cd42ebffc6ce0df000..701249e5a8b22afdec1e640ea4767d65ab275b52 100644 --- a/ir/expressions/yieldExpression.h +++ b/ir/expressions/yieldExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_EXPRESSION_YIELD_EXPRESSION_H #define ES2PANDA_IR_EXPRESSION_YIELD_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::compiler { class GeneratorFunctionBuilder; diff --git a/ir/irnode.h b/ir/irnode.h index 6e9fe355a001f85cf2b5c204edca2566b6208e1f..a9ff567e24a2b19194966be13247507d267463b1 100644 --- a/ir/irnode.h +++ b/ir/irnode.h @@ -16,12 +16,12 @@ #ifndef ES2PANDA_COMPILER_IR_IRNODE_H #define ES2PANDA_COMPILER_IR_IRNODE_H -#include "plugins/ecmascript/es2panda/compiler/base/literals.h" -#include "plugins/ecmascript/es2panda/compiler/core/vReg.h" -#include "plugins/ecmascript/es2panda/compiler/core/programElement.h" -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" +#include "compiler/base/literals.h" +#include "compiler/core/vReg.h" +#include "compiler/core/programElement.h" +#include "lexer/token/sourceLocation.h" #include "macros.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" #include "utils/span.h" #include diff --git a/ir/module/exportAllDeclaration.cpp b/ir/module/exportAllDeclaration.cpp index 69a847e307a1a54e08b7e6c2a2be11f60e6af878..a66ed1a218bc90bb6de983bb98fda32f037fe4e1 100644 --- a/ir/module/exportAllDeclaration.cpp +++ b/ir/module/exportAllDeclaration.cpp @@ -15,9 +15,9 @@ #include "exportAllDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/stringLiteral.h" namespace panda::es2panda::ir { void ExportAllDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/module/exportAllDeclaration.h b/ir/module/exportAllDeclaration.h index 8355de20aec3cf697475b3f1057a469270936062..afcdea02dc0642a422c4a88e6935da6cfaafb38e 100644 --- a/ir/module/exportAllDeclaration.h +++ b/ir/module/exportAllDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_MODULE_EXPORT_ALL_DECLARATION_H #define ES2PANDA_IR_MODULE_EXPORT_ALL_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/module/exportDefaultDeclaration.cpp b/ir/module/exportDefaultDeclaration.cpp index 0daa7b8c7d581a6323bc3e4b7b19cfbbff7b96d1..657179005ad193df5ed6ec2b95386b1f2c72077f 100644 --- a/ir/module/exportDefaultDeclaration.cpp +++ b/ir/module/exportDefaultDeclaration.cpp @@ -15,8 +15,8 @@ #include "exportDefaultDeclaration.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "compiler/core/pandagen.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void ExportDefaultDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/module/exportDefaultDeclaration.h b/ir/module/exportDefaultDeclaration.h index 029ed5b2903ca8f4318cc3e91493b5bec57eef98..38af658d5fd2109cc40f22b083b4cf0526b5b33a 100644 --- a/ir/module/exportDefaultDeclaration.h +++ b/ir/module/exportDefaultDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_MODULE_EXPORT_DEFAULT_DECLARATION_H #define ES2PANDA_IR_MODULE_EXPORT_DEFAULT_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class ExportDefaultDeclaration : public Statement { diff --git a/ir/module/exportNamedDeclaration.cpp b/ir/module/exportNamedDeclaration.cpp index a2101f4589eca96d4882f8d125e785eefefd4699..62acbf6f71d80d2a5c5fd9d88f41fca926014a17 100644 --- a/ir/module/exportNamedDeclaration.cpp +++ b/ir/module/exportNamedDeclaration.cpp @@ -15,12 +15,12 @@ #include "exportNamedDeclaration.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/module/exportSpecifier.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/base/decorator.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/module/exportSpecifier.h" namespace panda::es2panda::ir { void ExportNamedDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/module/exportNamedDeclaration.h b/ir/module/exportNamedDeclaration.h index 6d7f9f2ab200c92b68a8012850431451167e6f74..e794931975cb496b4ff75af645ee64f51e014fb2 100644 --- a/ir/module/exportNamedDeclaration.h +++ b/ir/module/exportNamedDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_MODULE_EXPORT_DECLARATION_H #define ES2PANDA_IR_MODULE_EXPORT_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class StringLiteral; diff --git a/ir/module/exportSpecifier.cpp b/ir/module/exportSpecifier.cpp index d9597d8b7f3280cb1f9f397fc68652b7b5a8bb2d..e308dd2b06e10d8ac06045377dea3290fad64075 100644 --- a/ir/module/exportSpecifier.cpp +++ b/ir/module/exportSpecifier.cpp @@ -15,8 +15,8 @@ #include "exportSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { void ExportSpecifier::TransformChildren(const NodeTransformer &cb) diff --git a/ir/module/exportSpecifier.h b/ir/module/exportSpecifier.h index 2f16d30f52b0306b717a6cae45833048fcc4a347..f6bfefbd9f576fc633d063ff5ac4fa8df07eba16 100644 --- a/ir/module/exportSpecifier.h +++ b/ir/module/exportSpecifier.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_MODULE_EXPORT_SPECIFIER_H #define ES2PANDA_IR_MODULE_EXPORT_SPECIFIER_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/module/importDeclaration.cpp b/ir/module/importDeclaration.cpp index f5e4250ca63f6a5e5b1b9a9e63ca3eb8cfb50af5..b946fbd1b679d90f467435cc458cbd68d79a3dbe 100644 --- a/ir/module/importDeclaration.cpp +++ b/ir/module/importDeclaration.cpp @@ -15,11 +15,11 @@ #include "importDeclaration.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/module/importNamespaceSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importSpecifier.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/module/importNamespaceSpecifier.h" +#include "ir/module/importSpecifier.h" namespace panda::es2panda::ir { void ImportDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/module/importDeclaration.h b/ir/module/importDeclaration.h index 3fe9573eb9c427169ea17cb55c337b60d426dc3b..18594b35e398f98c9fe13b2b31e26f42c2272922 100644 --- a/ir/module/importDeclaration.h +++ b/ir/module/importDeclaration.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_MODULE_IMPORT_DECLARATION_H #define ES2PANDA_IR_MODULE_IMPORT_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/statement.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class StringLiteral; diff --git a/ir/module/importDefaultSpecifier.cpp b/ir/module/importDefaultSpecifier.cpp index 7606a32cf55bdb469be1647999ad53ca86152603..2413efb897afcfa10a9ee7636f5f788fa027f7a9 100644 --- a/ir/module/importDefaultSpecifier.cpp +++ b/ir/module/importDefaultSpecifier.cpp @@ -15,11 +15,11 @@ #include "importDefaultSpecifier.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/module/importDeclaration.h" +#include "ir/expressions/literals/stringLiteral.h" namespace panda::es2panda::ir { void ImportDefaultSpecifier::TransformChildren(const NodeTransformer &cb) diff --git a/ir/module/importDefaultSpecifier.h b/ir/module/importDefaultSpecifier.h index 62dd49b15af97c383c696a061650ad2b81796454..7d39425a088c59f202e41c07c2acbc619f0478d3 100644 --- a/ir/module/importDefaultSpecifier.h +++ b/ir/module/importDefaultSpecifier.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_MODULE_IMPORT_DEFAULT_SPECIFIER_H #define ES2PANDA_IR_MODULE_IMPORT_DEFAULT_SPECIFIER_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/module/importNamespaceSpecifier.cpp b/ir/module/importNamespaceSpecifier.cpp index 7c9487e8cfff8153a30cf14c697ee083cc4cf4ee..45d2706c769c0f71020e8710b3197b2ee340c7a6 100644 --- a/ir/module/importNamespaceSpecifier.cpp +++ b/ir/module/importNamespaceSpecifier.cpp @@ -15,12 +15,12 @@ #include "importNamespaceSpecifier.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" +#include "checker/ETSchecker.h" +#include "binder/ETSBinder.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/module/importDeclaration.h" +#include "ir/expressions/literals/stringLiteral.h" namespace panda::es2panda::ir { void ImportNamespaceSpecifier::TransformChildren(const NodeTransformer &cb) diff --git a/ir/module/importNamespaceSpecifier.h b/ir/module/importNamespaceSpecifier.h index dff9e0fca2dfff1ed097e121b3be32d3b3ee5aa6..0af20262ba57e28274a7974262ef5ca60a22978a 100644 --- a/ir/module/importNamespaceSpecifier.h +++ b/ir/module/importNamespaceSpecifier.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_MODULE_IMPORT_NAMESPACE_SPECIFIER_H #define ES2PANDA_IR_MODULE_IMPORT_NAMESPACE_SPECIFIER_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/module/importSpecifier.cpp b/ir/module/importSpecifier.cpp index 2f1c5f62f65dec8d55c40900248d205e621057c4..343614347e2e30cb5af932d939965a43cac4ba45 100644 --- a/ir/module/importSpecifier.cpp +++ b/ir/module/importSpecifier.cpp @@ -15,11 +15,11 @@ #include "importSpecifier.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/module/importDeclaration.h" namespace panda::es2panda::ir { void ImportSpecifier::TransformChildren(const NodeTransformer &cb) diff --git a/ir/module/importSpecifier.h b/ir/module/importSpecifier.h index bcd0303d47c6cba370dab2c65ff1bec70bcc7191..9a0c1311abb9eee8973fb19ac1479b050cfabe99 100644 --- a/ir/module/importSpecifier.h +++ b/ir/module/importSpecifier.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_MODULE_AST_IMPORT_SPECIFIER_H #define ES2PANDA_IR_MODULE_AST_IMPORT_SPECIFIER_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/opaqueTypeNode.cpp b/ir/opaqueTypeNode.cpp index 2de25ec6e75883be07c390d9b6774903781791cf..ed97769f688258fee48389c2392565f1f3c7536e 100644 --- a/ir/opaqueTypeNode.cpp +++ b/ir/opaqueTypeNode.cpp @@ -14,7 +14,7 @@ */ #include "opaqueTypeNode.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { diff --git a/ir/opaqueTypeNode.h b/ir/opaqueTypeNode.h index a9616ff2119b59f90556005cf570db20334c0e38..326b72b4f730b74f38231f03a7ff9c5939de11c5 100644 --- a/ir/opaqueTypeNode.h +++ b/ir/opaqueTypeNode.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_ETS_OPAQUE_TYPE_NODE_H #define ES2PANDA_IR_ETS_OPAQUE_TYPE_NODE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { diff --git a/ir/statement.h b/ir/statement.h index 40d32c1f7c4ab83241f904a497206eba86b261ae..294752a162a4473549141b42f22e848ac3de2e82 100644 --- a/ir/statement.h +++ b/ir/statement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_H #define ES2PANDA_IR_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/astNode.h" +#include "ir/astNode.h" namespace panda::es2panda::ir { class ClassElement; diff --git a/ir/statements/assertStatement.cpp b/ir/statements/assertStatement.cpp index 48ca3340a9a538ad6ba41f2a519709abfbe435d9..01181345ae480efc149c7bca0917e2d8f810d940 100644 --- a/ir/statements/assertStatement.cpp +++ b/ir/statements/assertStatement.cpp @@ -15,14 +15,14 @@ #include "assertStatement.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/compiler/base/condition.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "binder/ETSBinder.h" +#include "compiler/base/condition.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/ETSchecker.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void AssertStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/assertStatement.h b/ir/statements/assertStatement.h index 2693a7d961988fd412d32d874eb1b2d11628b3f6..ec70fe0c3382dd99a1f96c7555530ef0e75a7713 100644 --- a/ir/statements/assertStatement.h +++ b/ir/statements/assertStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_ASSERT_STATEMENT_H #define ES2PANDA_IR_STATEMENT_ASSERT_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/statements/blockStatement.cpp b/ir/statements/blockStatement.cpp index 37a21272daa09a65e472ce6ff9f88559984648a6..69a50289a6e59a44e9aa7b0254c2ff911cedcf20 100644 --- a/ir/statements/blockStatement.cpp +++ b/ir/statements/blockStatement.cpp @@ -15,12 +15,12 @@ #include "blockStatement.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "binder/scope.h" +#include "compiler/core/regScope.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void BlockStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/blockStatement.h b/ir/statements/blockStatement.h index d24ad385bcfb188d5ad664f1c57dd5c0a28daf33..4e02c2296f5c7b6290265a90528ca1248870b447 100644 --- a/ir/statements/blockStatement.h +++ b/ir/statements/blockStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_BLOCK_STATEMENT_H #define ES2PANDA_IR_STATEMENT_BLOCK_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class BlockStatement : public Statement { diff --git a/ir/statements/breakStatement.cpp b/ir/statements/breakStatement.cpp index 8df215ba40680cdfbf53dab6c1a13e162b43a42c..43ab14c95139901fd01f0546fcc2aaac2e7178b2 100644 --- a/ir/statements/breakStatement.cpp +++ b/ir/statements/breakStatement.cpp @@ -15,11 +15,11 @@ #include "breakStatement.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::ir { void BreakStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/breakStatement.h b/ir/statements/breakStatement.h index a819bf06492daef143bda0cadafb3542678dd7ee..e9273960969cb2db367eca55bf3d22aa841a017a 100644 --- a/ir/statements/breakStatement.h +++ b/ir/statements/breakStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_BREAK_STATEMENT_H #define ES2PANDA_IR_STATEMENT_BREAK_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/statements/classDeclaration.cpp b/ir/statements/classDeclaration.cpp index 7a3c604cddba7bf9187981973b946bbb5bcdb899..6c0822d5f27188bd9be8fa96bf140895ef367ece 100644 --- a/ir/statements/classDeclaration.cpp +++ b/ir/statements/classDeclaration.cpp @@ -15,13 +15,13 @@ #include "classDeclaration.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "compiler/base/lreference.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/base/classDefinition.h" +#include "ir/base/decorator.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { void ClassDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/classDeclaration.h b/ir/statements/classDeclaration.h index aba496d267c9d78e107625bea782a0b47f085b58..c2e535c0740205f0be808f6d4e772d51b8f8e7b1 100644 --- a/ir/statements/classDeclaration.h +++ b/ir/statements/classDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_CLASS_DECLARATION_H #define ES2PANDA_IR_STATEMENT_CLASS_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class ClassDeclaration : public Statement { diff --git a/ir/statements/continueStatement.cpp b/ir/statements/continueStatement.cpp index 5327db5f8f6f584b2f1313cf4d2cb758cd2548fa..47cc3d6e75fe40a27693b0b06e5a141ed8b99bcb 100644 --- a/ir/statements/continueStatement.cpp +++ b/ir/statements/continueStatement.cpp @@ -15,10 +15,10 @@ #include "continueStatement.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::ir { void ContinueStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/continueStatement.h b/ir/statements/continueStatement.h index b07ec13528cb71777477be80ae33e68bbf78ab9f..2eead3db014edee313f4d7df437480dc734736f2 100644 --- a/ir/statements/continueStatement.h +++ b/ir/statements/continueStatement.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_STATEMENT_H_CONTINUE_STATEMENT_H #define ES2PANDA_IR_STATEMENT_H_CONTINUE_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "ir/statement.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { class ContinueStatement : public Statement { diff --git a/ir/statements/debuggerStatement.cpp b/ir/statements/debuggerStatement.cpp index 81aff41e03c306ca6ba00f5b27a3be11b61457ab..506daf50ae480818324ae2a6532fa1dc2cd1ba5b 100644 --- a/ir/statements/debuggerStatement.cpp +++ b/ir/statements/debuggerStatement.cpp @@ -15,7 +15,7 @@ #include "debuggerStatement.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void DebuggerStatement::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/statements/debuggerStatement.h b/ir/statements/debuggerStatement.h index 0317e135bc583240df83f85d85229d27475ef7d7..d9858dbfd48308a8c4f381539a0c05f9936ab209 100644 --- a/ir/statements/debuggerStatement.h +++ b/ir/statements/debuggerStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_H_DEBUGGER_STATEMENT_H #define ES2PANDA_IR_STATEMENT_H_DEBUGGER_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class DebuggerStatement : public Statement { diff --git a/ir/statements/doWhileStatement.cpp b/ir/statements/doWhileStatement.cpp index d3abf38825c86cf55976f8381998fc46facd3cfc..d7a875423f3d52aeeab38069de7e109e159e9b53 100644 --- a/ir/statements/doWhileStatement.cpp +++ b/ir/statements/doWhileStatement.cpp @@ -15,14 +15,14 @@ #include "doWhileStatement.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/base/condition.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "binder/scope.h" +#include "compiler/base/condition.h" +#include "compiler/core/labelTarget.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void DoWhileStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/doWhileStatement.h b/ir/statements/doWhileStatement.h index 99cf5786e3b3adff841cdeb801643ac4607c7f8f..58cf43cfca1af649dd59b60d67b4e6d3ef12fe2c 100644 --- a/ir/statements/doWhileStatement.h +++ b/ir/statements/doWhileStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_H_DO_WHILE_STATEMENT_H #define ES2PANDA_IR_STATEMENT_H_DO_WHILE_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statements/loopStatement.h" +#include "ir/statements/loopStatement.h" namespace panda::es2panda::binder { class LoopScope; diff --git a/ir/statements/emptyStatement.cpp b/ir/statements/emptyStatement.cpp index c4b94136cd39bc05918e3567cab06e10962a2dda..5da09fdd2284bad2b67f115767bb55cd0e163517 100644 --- a/ir/statements/emptyStatement.cpp +++ b/ir/statements/emptyStatement.cpp @@ -15,7 +15,7 @@ #include "emptyStatement.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void EmptyStatement::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/statements/emptyStatement.h b/ir/statements/emptyStatement.h index 466999a281414e3effda79f917205380a73a9f6b..44c82b2fba26420907ff6388cb687a08da889b22 100644 --- a/ir/statements/emptyStatement.h +++ b/ir/statements/emptyStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_EMPTY_STATEMENT_H #define ES2PANDA_IR_STATEMENT_EMPTY_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class EmptyStatement : public Statement { diff --git a/ir/statements/expressionStatement.cpp b/ir/statements/expressionStatement.cpp index ff9d5ee67d461ce0bc5ebd648d636f87f9479556..61ebaca008147e8c817413c5420f97726aaa5de2 100644 --- a/ir/statements/expressionStatement.cpp +++ b/ir/statements/expressionStatement.cpp @@ -15,8 +15,8 @@ #include "expressionStatement.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void ExpressionStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/expressionStatement.h b/ir/statements/expressionStatement.h index 3bbbeadcd7a7c07c53dae01bce11349880dcd87c..2f80d87221946a812a42877339724d51be7cad30 100644 --- a/ir/statements/expressionStatement.h +++ b/ir/statements/expressionStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_EXPRESSION_STATEMENT_H #define ES2PANDA_IR_STATEMENT_EXPRESSION_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/statements/forInStatement.cpp b/ir/statements/forInStatement.cpp index 09d0e7eb6bdb9e86cd853d7ba0c3e1f843de99ab..2a3a56cce8a51b3a37eee70f2d705d0b77184cf0 100644 --- a/ir/statements/forInStatement.cpp +++ b/ir/statements/forInStatement.cpp @@ -15,14 +15,14 @@ #include "forInStatement.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" - -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "binder/scope.h" +#include "compiler/base/lreference.h" +#include "compiler/core/labelTarget.h" +#include "compiler/core/pandagen.h" +#include "checker/TSchecker.h" + +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void ForInStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/forInStatement.h b/ir/statements/forInStatement.h index 0b4bd06baa2cdc4b4fa9b9ca745b5173c894f7f6..c8e99fb4fb670336cffa9225866a076bbfdd9f1f 100644 --- a/ir/statements/forInStatement.h +++ b/ir/statements/forInStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_FOR_IN_STATEMENT_H #define ES2PANDA_IR_STATEMENT_FOR_IN_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statements/loopStatement.h" +#include "ir/statements/loopStatement.h" namespace panda::es2panda::binder { class LoopScope; diff --git a/ir/statements/forOfStatement.cpp b/ir/statements/forOfStatement.cpp index 9e5b7e48a027e138510bf456cf7734051ff4d58f..a12a98104677acf9f96bce9580a73e4ef4149687 100644 --- a/ir/statements/forOfStatement.cpp +++ b/ir/statements/forOfStatement.cpp @@ -15,18 +15,18 @@ #include "forOfStatement.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/base/iterators.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/superExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" +#include "binder/scope.h" +#include "compiler/base/iterators.h" +#include "compiler/base/lreference.h" +#include "compiler/core/labelTarget.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/expression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/superExpression.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/variableDeclaration.h" namespace panda::es2panda::ir { void ForOfStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/forOfStatement.h b/ir/statements/forOfStatement.h index 6d21105c1c798a7da54bdba9e3c83a0e95a17edd..9bb2ecf8d51dd132908988e1d8230a0b3c7d32ab 100644 --- a/ir/statements/forOfStatement.h +++ b/ir/statements/forOfStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_FOR_OF_STATEMENT_H #define ES2PANDA_IR_STATEMENT_FOR_OF_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statements/loopStatement.h" +#include "ir/statements/loopStatement.h" namespace panda::es2panda::binder { class LoopScope; diff --git a/ir/statements/forUpdateStatement.cpp b/ir/statements/forUpdateStatement.cpp index 2ac1f9103e105140461f8c9230c4a26f3d1f2402..d297b0a52fbcc177e3e6302bccb81c3f16c598a6 100644 --- a/ir/statements/forUpdateStatement.cpp +++ b/ir/statements/forUpdateStatement.cpp @@ -15,16 +15,16 @@ #include "forUpdateStatement.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/base/condition.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/dynamicContext.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "binder/scope.h" +#include "compiler/base/condition.h" +#include "compiler/base/lreference.h" +#include "compiler/core/labelTarget.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/dynamicContext.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void ForUpdateStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/forUpdateStatement.h b/ir/statements/forUpdateStatement.h index 1dc27f3031ddd609925f7159639336b78a8ec828..d6a1c001a7311e6754a6d13401c44fdc0d563b33 100644 --- a/ir/statements/forUpdateStatement.h +++ b/ir/statements/forUpdateStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_FOR_UPDATE_STATEMENT_H #define ES2PANDA_IR_STATEMENT_FOR_UPDATE_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statements/loopStatement.h" +#include "ir/statements/loopStatement.h" namespace panda::es2panda::binder { class LoopScope; diff --git a/ir/statements/functionDeclaration.cpp b/ir/statements/functionDeclaration.cpp index 43c4da0e1d59efea50a1b0c14bc386696477315c..5eb8b27490ede291508d662466151fe01679f93d 100644 --- a/ir/statements/functionDeclaration.cpp +++ b/ir/statements/functionDeclaration.cpp @@ -15,18 +15,18 @@ #include "functionDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "binder/variable.h" +#include "binder/scope.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/types/ets/etsFunctionType.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/base/spreadElement.h" +#include "ir/base/decorator.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { void FunctionDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/functionDeclaration.h b/ir/statements/functionDeclaration.h index 9f4b326fc39d80fa98d901c49bafdfb91cd1e277..0c00928b77c77239586cc8f93347ddc1cd002ad2 100644 --- a/ir/statements/functionDeclaration.h +++ b/ir/statements/functionDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_FUNCTION_DECLARATION_H #define ES2PANDA_IR_STATEMENT_FUNCTION_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class ScriptFunction; diff --git a/ir/statements/ifStatement.cpp b/ir/statements/ifStatement.cpp index 2f613ed5c500ae0bd016d996ec1fefb42979b632..b931fe18b8e94cd6a346990c5a22145b11176b11 100644 --- a/ir/statements/ifStatement.cpp +++ b/ir/statements/ifStatement.cpp @@ -15,12 +15,12 @@ #include "ifStatement.h" -#include "plugins/ecmascript/es2panda/compiler/base/condition.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "compiler/base/condition.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void IfStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/ifStatement.h b/ir/statements/ifStatement.h index 855d9af8d270661e69e85b6ce285581aa11dc5c7..b2596d77bc4043995a8fca37e3c52555433dac39 100644 --- a/ir/statements/ifStatement.h +++ b/ir/statements/ifStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_IF_STATEMENT_H #define ES2PANDA_IR_STATEMENT_IF_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/statements/labelledStatement.cpp b/ir/statements/labelledStatement.cpp index 8c8ca02442172bdb58e7e734fffe9b2119fb84ea..be77a04fdcb42c826352d2467bebf1c37e54b8bc 100644 --- a/ir/statements/labelledStatement.cpp +++ b/ir/statements/labelledStatement.cpp @@ -15,11 +15,11 @@ #include "labelledStatement.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/labelTarget.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { void LabelledStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/labelledStatement.h b/ir/statements/labelledStatement.h index d6cd8fef63f6f208cec272f2a07ec0da0017c6a2..7a5779bd3febc3c7c20a37847e7b76a2f3191d3b 100644 --- a/ir/statements/labelledStatement.h +++ b/ir/statements/labelledStatement.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_STATEMENT_LABELLED_STATEMENT_H #define ES2PANDA_IR_STATEMENT_LABELLED_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "ir/statement.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/statements/loopStatement.cpp b/ir/statements/loopStatement.cpp index af14822f17867cb8d2097aacc0a39c1ecbdd7f7c..4b547874af9f890240cc480a30346742e5945214 100644 --- a/ir/statements/loopStatement.cpp +++ b/ir/statements/loopStatement.cpp @@ -15,7 +15,7 @@ #include "loopStatement.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" +#include "binder/scope.h" namespace panda::es2panda::ir { } // namespace panda::es2panda::ir diff --git a/ir/statements/loopStatement.h b/ir/statements/loopStatement.h index 9b0986a1574aa87a3e9a889727c3bce3ff270b43..1bd9e38af3c26a6fc626d8fc8c100654578788ce 100644 --- a/ir/statements/loopStatement.h +++ b/ir/statements/loopStatement.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_STATEMENT_LOOP_STATEMENT_H #define ES2PANDA_IR_STATEMENT_LOOP_STATEMENT_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "binder/scope.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class LoopStatement : public Statement { diff --git a/ir/statements/returnStatement.cpp b/ir/statements/returnStatement.cpp index d7a4b66dd93419bcb65e96c3b488d80f501752e3..fd6286ae9134246e7d77aabade118e9b4c7ff503 100644 --- a/ir/statements/returnStatement.cpp +++ b/ir/statements/returnStatement.cpp @@ -15,19 +15,19 @@ #include "returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" -#include "plugins/ecmascript/es2panda/checker/types/typeRelation.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/ets/typeRelationContext.h" +#include "checker/types/typeRelation.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/expression.h" +#include "ir/expressions/objectExpression.h" +#include "util/helpers.h" namespace panda::es2panda::ir { void ReturnStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/returnStatement.h b/ir/statements/returnStatement.h index d896fea9c7811078ba7a9ea6b41b3ce333e488ed..44c9addebef3b93cb31f37e6b70a04bc4a87aa6b 100644 --- a/ir/statements/returnStatement.h +++ b/ir/statements/returnStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_RETURN_STATEMENT_H #define ES2PANDA_IR_STATEMENT_RETURN_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class ReturnStatement : public Statement { diff --git a/ir/statements/switchCaseStatement.cpp b/ir/statements/switchCaseStatement.cpp index 23c8447a1c7af4ea16e8d3886fac69a59d208913..d5135069d4ecf8d229075d70e0095d2c6c4de3c2 100644 --- a/ir/statements/switchCaseStatement.cpp +++ b/ir/statements/switchCaseStatement.cpp @@ -15,8 +15,8 @@ #include "switchCaseStatement.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void SwitchCaseStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/switchCaseStatement.h b/ir/statements/switchCaseStatement.h index af45ccd27b56830567d860791f88d90185c8b58c..0ed32b85facd23ca10301372f9e6c2616dd9e74e 100644 --- a/ir/statements/switchCaseStatement.h +++ b/ir/statements/switchCaseStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_SWITCH_CASE_STATEMENT_H #define ES2PANDA_IR_STATEMENT_SWITCH_CASE_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/statements/switchStatement.cpp b/ir/statements/switchStatement.cpp index ec51c479a21b066d0da26f4f723297d6dc17a9f2..c5d3df85532bf34c3e808affd81dbece441fd436 100644 --- a/ir/statements/switchStatement.cpp +++ b/ir/statements/switchStatement.cpp @@ -15,18 +15,18 @@ #include "switchStatement.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" -#include "plugins/ecmascript/es2panda/compiler/core/switchBuilder.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/typeRelationContext.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchCaseStatement.h" +#include "binder/scope.h" +#include "compiler/core/labelTarget.h" +#include "compiler/core/switchBuilder.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "checker/TSchecker.h" +#include "checker/ets/typeRelationContext.h" +#include "ir/astDump.h" +#include "ir/expression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/memberExpression.h" +#include "ir/statements/switchCaseStatement.h" namespace panda::es2panda::ir { void SwitchStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/switchStatement.h b/ir/statements/switchStatement.h index f7f31197fac911decf11c129b78adf4b68c4b846..847f426da372597214fb733e03ddabd5a05c4bac 100644 --- a/ir/statements/switchStatement.h +++ b/ir/statements/switchStatement.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_STATEMENT_SWITCH_STATEMENT_H #define ES2PANDA_IR_STATEMENT_SWITCH_STATEMENT_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "binder/scope.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/statements/throwStatement.cpp b/ir/statements/throwStatement.cpp index db45c701419de09fe8d68f812f2c704c2a71a6e1..ab088aaab7aea733cb17e4cace70d632773a3238 100644 --- a/ir/statements/throwStatement.cpp +++ b/ir/statements/throwStatement.cpp @@ -15,10 +15,10 @@ #include "throwStatement.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void ThrowStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/throwStatement.h b/ir/statements/throwStatement.h index f348ce1cea13ed5b0c704157a9485c5fd8c7a91b..dff234ec250d002201d7ad518cf8cdcd3651b0a6 100644 --- a/ir/statements/throwStatement.h +++ b/ir/statements/throwStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_THROW_STATEMENT_H #define ES2PANDA_IR_STATEMENT_THROW_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/statements/tryStatement.cpp b/ir/statements/tryStatement.cpp index ca8d7380f87e7ba10bcc2d9975b2198fcdc7054e..8133ee83f9be7871f3e4dd9432772e135af8aa9d 100644 --- a/ir/statements/tryStatement.cpp +++ b/ir/statements/tryStatement.cpp @@ -15,13 +15,13 @@ #include "tryStatement.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/dynamicContext.h" -#include "plugins/ecmascript/es2panda/compiler/base/catchTable.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/catchClause.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/dynamicContext.h" +#include "compiler/base/catchTable.h" +#include "ir/astDump.h" +#include "ir/base/catchClause.h" +#include "ir/statements/blockStatement.h" namespace panda::es2panda::ir { void TryStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/tryStatement.h b/ir/statements/tryStatement.h index 4acb218dc3449fb3b44f413560e903429822039b..74b955c87aca3f798585faf0c83457db28d74159 100644 --- a/ir/statements/tryStatement.h +++ b/ir/statements/tryStatement.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_STATEMENT_TRY_STATEMENT_H #define ES2PANDA_IR_STATEMENT_TRY_STATEMENT_H -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "compiler/core/ETSGen.h" +#include "ir/statement.h" namespace panda::es2panda::compiler { class PandaGen; diff --git a/ir/statements/variableDeclaration.cpp b/ir/statements/variableDeclaration.cpp index cde204ee64c77feebe0f595429921d198ad849e9..79ced21cc653c268a13804cff7b0ca5ff85ef242 100644 --- a/ir/statements/variableDeclaration.cpp +++ b/ir/statements/variableDeclaration.cpp @@ -15,16 +15,16 @@ #include "variableDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/base/decorator.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/objectExpression.h" +#include "ir/statements/variableDeclarator.h" namespace panda::es2panda::ir { void VariableDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/variableDeclaration.h b/ir/statements/variableDeclaration.h index 4578eddd78c496da3660d15cb48ce308a0bed4d3..601170366b6d7bc04feb7395bc72542d65953875 100644 --- a/ir/statements/variableDeclaration.h +++ b/ir/statements/variableDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_VARIABLE_DECLARATION_H #define ES2PANDA_IR_STATEMENT_VARIABLE_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class VariableDeclarator; diff --git a/ir/statements/variableDeclarator.cpp b/ir/statements/variableDeclarator.cpp index 85e76c41eaeda4b8529f1393cbae15dcab51c5a0..7c2cf8a007b110e00acc45731dbef1744b0bd37a 100644 --- a/ir/statements/variableDeclarator.cpp +++ b/ir/statements/variableDeclarator.cpp @@ -15,22 +15,22 @@ #include "variableDeclarator.h" -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" -#include "plugins/ecmascript/es2panda/compiler/base/lreference.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" - -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ts/destructuringContext.h" +#include "binder/variableFlags.h" +#include "compiler/base/lreference.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" +#include "ir/astNode.h" +#include "ir/typeNode.h" +#include "ir/expression.h" +#include "ir/statements/variableDeclaration.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/identifier.h" + +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/ts/destructuringContext.h" namespace panda::es2panda::ir { void VariableDeclarator::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/variableDeclarator.h b/ir/statements/variableDeclarator.h index cf67cb316af6462e2c6c9cae0deb18eec88810c6..1b1234ff3e01b1c93e834971ac0b4f050ebe183a 100644 --- a/ir/statements/variableDeclarator.h +++ b/ir/statements/variableDeclarator.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_STATEMENT_VARIABLE_DECLARATOR_H #define ES2PANDA_IR_STATEMENT_VARIABLE_DECLARATOR_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/expression.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/statements/whileStatement.cpp b/ir/statements/whileStatement.cpp index 0a1fbad53c029a168b9228fc0fd70e680f3d2d84..ebfaa2a8c3a42018a2c5789414cc9acf5919d918 100644 --- a/ir/statements/whileStatement.cpp +++ b/ir/statements/whileStatement.cpp @@ -15,15 +15,15 @@ #include "whileStatement.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/compiler/base/condition.h" -#include "plugins/ecmascript/es2panda/compiler/core/labelTarget.h" -#include "plugins/ecmascript/es2panda/compiler/core/pandagen.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/compiler/core/regScope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "binder/scope.h" +#include "compiler/base/condition.h" +#include "compiler/core/labelTarget.h" +#include "compiler/core/pandagen.h" +#include "compiler/core/ETSGen.h" +#include "compiler/core/regScope.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void WhileStatement::TransformChildren(const NodeTransformer &cb) diff --git a/ir/statements/whileStatement.h b/ir/statements/whileStatement.h index e1d3f263c7d90f2bf86c1103a253d3740a4e5448..7ecf3c147d7214204da0f3bbc973b8ff00b321b5 100644 --- a/ir/statements/whileStatement.h +++ b/ir/statements/whileStatement.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_STATEMENT_WHILE_STATEMENT_H #define ES2PANDA_IR_STATEMENT_WHILE_STATEMENT_H -#include "plugins/ecmascript/es2panda/ir/statements/loopStatement.h" +#include "ir/statements/loopStatement.h" namespace panda::es2panda::binder { class LoopScope; diff --git a/ir/ts/tsAnyKeyword.cpp b/ir/ts/tsAnyKeyword.cpp index 352384fa369cd93f42ca8dfba77b72f5ceba55f4..170d086c834e06131469232c55c42778705bb7a6 100644 --- a/ir/ts/tsAnyKeyword.cpp +++ b/ir/ts/tsAnyKeyword.cpp @@ -15,8 +15,8 @@ #include "tsAnyKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSAnyKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsAnyKeyword.h b/ir/ts/tsAnyKeyword.h index 237c8ba0513d7e11087a6f23c2384a0a13274dbc..5719a54c0a73cc95b06679d6190b869ba21910f6 100644 --- a/ir/ts/tsAnyKeyword.h +++ b/ir/ts/tsAnyKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_ANY_KEYWORD_H #define ES2PANDA_IR_TS_ANY_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSAnyKeyword : public TypeNode { diff --git a/ir/ts/tsArrayType.cpp b/ir/ts/tsArrayType.cpp index a7845b3ca5b9e946ea606f463c223233501aff38..725b911850243ecc5d0cd605f7b60baa1e4f9685 100644 --- a/ir/ts/tsArrayType.cpp +++ b/ir/ts/tsArrayType.cpp @@ -15,9 +15,9 @@ #include "tsArrayType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::ir { void TSArrayType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsArrayType.h b/ir/ts/tsArrayType.h index c022b83babf367fc5ee4fcbd21fcfa48895eb888..add9c0e33b5e3b66673c445dc79d538a4c55cb77 100644 --- a/ir/ts/tsArrayType.h +++ b/ir/ts/tsArrayType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_ARRAY_TYPE_H #define ES2PANDA_IR_TS_ARRAY_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSArrayType : public TypeNode { diff --git a/ir/ts/tsAsExpression.cpp b/ir/ts/tsAsExpression.cpp index 7832bc8859e0b4b4f93ebaf7dcb0148cdaeb6baf..cdbb98ffadcecb859f81492414c1853785ed0661 100644 --- a/ir/ts/tsAsExpression.cpp +++ b/ir/ts/tsAsExpression.cpp @@ -15,17 +15,17 @@ #include "tsAsExpression.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ets/castingContext.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literal.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/unaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsFunctionType.h" +#include "binder/scope.h" +#include "checker/TSchecker.h" +#include "checker/ets/castingContext.h" +#include "compiler/core/ETSGen.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literal.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/unaryExpression.h" +#include "ir/typeNode.h" +#include "ir/ets/etsFunctionType.h" namespace panda::es2panda::ir { Expression *TSAsExpression::Expr() diff --git a/ir/ts/tsAsExpression.h b/ir/ts/tsAsExpression.h index bbfd092c1672fe713af026a7a686c9b72f931b5b..549851835e5e6a0daec1699118710ce22e24304a 100644 --- a/ir/ts/tsAsExpression.h +++ b/ir/ts/tsAsExpression.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_TS_AS_EXPRESSION_H #define ES2PANDA_IR_TS_AS_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TSAsExpression : public AnnotatedExpression { diff --git a/ir/ts/tsBigintKeyword.cpp b/ir/ts/tsBigintKeyword.cpp index 7473da3cf127fb3da586c6c358b6b6f5a10e9e5b..0d50b96a5ab9f8b1acd0c49958c48e156adcf09b 100644 --- a/ir/ts/tsBigintKeyword.cpp +++ b/ir/ts/tsBigintKeyword.cpp @@ -15,8 +15,8 @@ #include "tsBigintKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSBigintKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsBigintKeyword.h b/ir/ts/tsBigintKeyword.h index 7694d00d5664af2d2d5dbf3ab722de6880beaf3c..61fe591e040781010a4ff675898e2aea9c5894b1 100644 --- a/ir/ts/tsBigintKeyword.h +++ b/ir/ts/tsBigintKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_BIGINT_KEYWORD_H #define ES2PANDA_IR_TS_BIGINT_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSBigintKeyword : public TypeNode { diff --git a/ir/ts/tsBooleanKeyword.cpp b/ir/ts/tsBooleanKeyword.cpp index 099f0862771440202c7ce6fcc4a8b8acb5ce307d..f5759ccf7f82246b477557cff9dcbc2e04714c1b 100644 --- a/ir/ts/tsBooleanKeyword.cpp +++ b/ir/ts/tsBooleanKeyword.cpp @@ -15,8 +15,8 @@ #include "tsBooleanKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSBooleanKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsBooleanKeyword.h b/ir/ts/tsBooleanKeyword.h index d75ee260775108c7a8487143d4971aa589063a18..a4936f1cecadf7e928448c41e891ebc3dcfd8eeb 100644 --- a/ir/ts/tsBooleanKeyword.h +++ b/ir/ts/tsBooleanKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_BOOLEAN_KEYWORD_H #define ES2PANDA_IR_TS_BOOLEAN_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSBooleanKeyword : public TypeNode { diff --git a/ir/ts/tsClassImplements.cpp b/ir/ts/tsClassImplements.cpp index a4d61ec36e68a35206d898fc7d98c83dda9777fb..00ad11e2dfc0f4faa6749dbec51933a96da287b9 100644 --- a/ir/ts/tsClassImplements.cpp +++ b/ir/ts/tsClassImplements.cpp @@ -15,9 +15,9 @@ #include "tsClassImplements.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" +#include "ir/astDump.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterInstantiation.h" namespace panda::es2panda::ir { void TSClassImplements::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsClassImplements.h b/ir/ts/tsClassImplements.h index fc2867e5daf1b7869fd1b922cbf012f0c84ae130..82b5510f923bdea31583e784ebc8f4bace2ca702 100644 --- a/ir/ts/tsClassImplements.h +++ b/ir/ts/tsClassImplements.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_CLASS_IMPLEMENTS_H #define ES2PANDA_IR_TS_CLASS_IMPLEMENTS_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TSTypeParameterInstantiation; diff --git a/ir/ts/tsConditionalType.cpp b/ir/ts/tsConditionalType.cpp index 696f45dce814d84cd18ab0548d2c03c99c1bad26..175de0652ff92201aaa38c1c0d7e0a05aed3fa8b 100644 --- a/ir/ts/tsConditionalType.cpp +++ b/ir/ts/tsConditionalType.cpp @@ -15,7 +15,7 @@ #include "tsConditionalType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void TSConditionalType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsConditionalType.h b/ir/ts/tsConditionalType.h index e352f6d5da5a1f191af8242dddc6123e33abf774..d2a26839ea1f37c9a65d12bc02216d786bc4529b 100644 --- a/ir/ts/tsConditionalType.h +++ b/ir/ts/tsConditionalType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_CONDITIONAL_TYPE_H #define ES2PANDA_IR_TS_CONDITIONAL_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSConditionalType : public TypeNode { diff --git a/ir/ts/tsConstructorType.cpp b/ir/ts/tsConstructorType.cpp index 9b4ed63402eb96888fa75823a7cba3d54f2ce4a3..becd2bbb917b5af56476f22cd6f33bde2ca5dc2b 100644 --- a/ir/ts/tsConstructorType.cpp +++ b/ir/ts/tsConstructorType.cpp @@ -15,12 +15,12 @@ #include "tsConstructorType.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" +#include "binder/scope.h" +#include "checker/TSchecker.h" +#include "checker/types/signature.h" +#include "ir/astDump.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterDeclaration.h" namespace panda::es2panda::ir { void TSConstructorType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsConstructorType.h b/ir/ts/tsConstructorType.h index ad40a08ef412886144acbfe80595ec18a745ea8b..2d84aebc7c89d8f90e8854c1a94d7f65acb3da75 100644 --- a/ir/ts/tsConstructorType.h +++ b/ir/ts/tsConstructorType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_CONSTRUCTOR_TYPE_H #define ES2PANDA_IR_TS_CONSTRUCTOR_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypeParameterDeclaration; diff --git a/ir/ts/tsEnumDeclaration.cpp b/ir/ts/tsEnumDeclaration.cpp index 8695d8f496ab6ce003d4ddbca3a9b38e2bae8558..5a9ffff6061de5265e7fd205d08d1bb4ba82e00d 100644 --- a/ir/ts/tsEnumDeclaration.cpp +++ b/ir/ts/tsEnumDeclaration.cpp @@ -15,22 +15,22 @@ #include "tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/unaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/templateLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "binder/scope.h" +#include "util/helpers.h" +#include "ir/astDump.h" +#include "ir/base/decorator.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" +#include "ir/base/methodDefinition.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/unaryExpression.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/templateLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/ts/tsEnumMember.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::ir { void TSEnumDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsEnumDeclaration.h b/ir/ts/tsEnumDeclaration.h index 94c0bb06c07b715d7825e5acd687ed98c269b2d3..7661f213950e3f9d819dc497096eb8e2006ca26e 100644 --- a/ir/ts/tsEnumDeclaration.h +++ b/ir/ts/tsEnumDeclaration.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_IR_TS_ENUM_DECLARATION_H #define ES2PANDA_IR_TS_ENUM_DECLARATION_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" -#include "plugins/ecmascript/es2panda/binder/enumMemberResult.h" +#include "binder/scope.h" +#include "ir/statement.h" +#include "binder/enumMemberResult.h" namespace panda::es2panda::binder { class EnumVariable; diff --git a/ir/ts/tsEnumMember.cpp b/ir/ts/tsEnumMember.cpp index d540bf9e38e6fbfe77a2d96b77fac743ae5f0f77..d0cb459a00ee3e5d787bc70aacf7b6c7f14c48cc 100644 --- a/ir/ts/tsEnumMember.cpp +++ b/ir/ts/tsEnumMember.cpp @@ -15,9 +15,9 @@ #include "tsEnumMember.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "ir/astDump.h" +#include "ir/expression.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { void TSEnumMember::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsEnumMember.h b/ir/ts/tsEnumMember.h index 30e13d77801caa8be7cc8ccb3022afcae0b36434..52918aee6035283dfd9502090324f2035ba06f66 100644 --- a/ir/ts/tsEnumMember.h +++ b/ir/ts/tsEnumMember.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_ENUM_MEMBER_H #define ES2PANDA_IR_TS_ENUM_MEMBER_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/ts/tsExternalModuleReference.cpp b/ir/ts/tsExternalModuleReference.cpp index 4d61152935877b0aa433d93da53200555f46157d..5e9aa155d8e9903772b48181c504ae15de8bb758 100644 --- a/ir/ts/tsExternalModuleReference.cpp +++ b/ir/ts/tsExternalModuleReference.cpp @@ -15,7 +15,7 @@ #include "tsExternalModuleReference.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void TSExternalModuleReference::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsExternalModuleReference.h b/ir/ts/tsExternalModuleReference.h index 963cd773578efa80fe706054bd921a9d1cc1beb8..2ab4685a25524fa460de66ddb231c6ffd88a94bd 100644 --- a/ir/ts/tsExternalModuleReference.h +++ b/ir/ts/tsExternalModuleReference.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_EXTERNAL_MODULE_REFERENCE_H #define ES2PANDA_IR_TS_EXTERNAL_MODULE_REFERENCE_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TSExternalModuleReference : public Expression { diff --git a/ir/ts/tsFunctionType.cpp b/ir/ts/tsFunctionType.cpp index f0903f33ef97d286ec7236b843049c202d1a28bd..9bee18d5db802e1d645cc3dedb5c5f66caf0475b 100644 --- a/ir/ts/tsFunctionType.cpp +++ b/ir/ts/tsFunctionType.cpp @@ -15,15 +15,15 @@ #include "tsFunctionType.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" +#include "binder/scope.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "checker/types/signature.h" +#include "ir/astDump.h" +#include "ir/base/spreadElement.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterDeclaration.h" namespace panda::es2panda::ir { void TSFunctionType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsFunctionType.h b/ir/ts/tsFunctionType.h index e3d369fc6f7f6cdaa2ae03c89dae037488b8d3ea..8f8d3f16a69b8ff96c692a43886bb8a78b1db789 100644 --- a/ir/ts/tsFunctionType.h +++ b/ir/ts/tsFunctionType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_FUNCTION_TYPE_H #define ES2PANDA_IR_TS_FUNCTION_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypeParameterDeclaration; diff --git a/ir/ts/tsImportEqualsDeclaration.cpp b/ir/ts/tsImportEqualsDeclaration.cpp index 17544aa054ffa85d731120117f59c39b63e16d92..eb615a791ebf495e47bb4b41db224e1e41bfbd76 100644 --- a/ir/ts/tsImportEqualsDeclaration.cpp +++ b/ir/ts/tsImportEqualsDeclaration.cpp @@ -15,9 +15,9 @@ #include "tsImportEqualsDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "ir/astDump.h" +#include "ir/expression.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { void TSImportEqualsDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsImportEqualsDeclaration.h b/ir/ts/tsImportEqualsDeclaration.h index 2c66baa149bbf69c8f36fcf92f51c4ba18ef6f61..cc2d7dea4b72747b0df89e9983df872e5c92a575 100644 --- a/ir/ts/tsImportEqualsDeclaration.h +++ b/ir/ts/tsImportEqualsDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_IMPORT_EQUALS_DECLARATION_H #define ES2PANDA_IR_TS_IMPORT_EQUALS_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/ts/tsImportType.cpp b/ir/ts/tsImportType.cpp index fafa42ce9793db7bc47fa9aa5b612abbc2ee2be2..6cdc3ba60ccc9f71c4dfd4b5cd79cb4c77545471 100644 --- a/ir/ts/tsImportType.cpp +++ b/ir/ts/tsImportType.cpp @@ -15,9 +15,9 @@ #include "tsImportType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" +#include "ir/astDump.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterInstantiation.h" namespace panda::es2panda::ir { void TSImportType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsImportType.h b/ir/ts/tsImportType.h index ddb196924ea07f0a2572978426e057bf4bbd8466..2813e2a83178f566a339e93e735ba06d1763af8c 100644 --- a/ir/ts/tsImportType.h +++ b/ir/ts/tsImportType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_IMPORT_TYPE_H #define ES2PANDA_IR_TS_IMPORT_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypeParameterInstantiation; diff --git a/ir/ts/tsIndexedAccessType.cpp b/ir/ts/tsIndexedAccessType.cpp index cac2c323007b315f3d3e84c4b7a4076bf5b04292..6c4f97c5699bf0c013e391c57659b8a2e1fc72fb 100644 --- a/ir/ts/tsIndexedAccessType.cpp +++ b/ir/ts/tsIndexedAccessType.cpp @@ -15,9 +15,9 @@ #include "tsIndexedAccessType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSIndexedAccessType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsIndexedAccessType.h b/ir/ts/tsIndexedAccessType.h index 27efc789e3919748f364488e55ae37499444f7b0..1d456ed9b39d08f8ee1d1205ff6f9ff1003c1a10 100644 --- a/ir/ts/tsIndexedAccessType.h +++ b/ir/ts/tsIndexedAccessType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_INDEXED_ACCESS_TYPE_H #define ES2PANDA_IR_TS_INDEXED_ACCESS_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSIndexedAccessType : public TypeNode { diff --git a/ir/ts/tsInferType.cpp b/ir/ts/tsInferType.cpp index 7acc6c97def42c5d842630d762d9cb2dab96155f..5c06f1613556beebec0eba10434a272e058b3d0f 100644 --- a/ir/ts/tsInferType.cpp +++ b/ir/ts/tsInferType.cpp @@ -15,8 +15,8 @@ #include "tsInferType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" +#include "ir/astDump.h" +#include "ir/ts/tsTypeParameter.h" namespace panda::es2panda::ir { void TSInferType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsInferType.h b/ir/ts/tsInferType.h index cfbae58a81befe81ad92388f4647aef56b79b713..5d62c9776c69c87527c9f9809754817341d5cf0d 100644 --- a/ir/ts/tsInferType.h +++ b/ir/ts/tsInferType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_INFER_TYPE_H #define ES2PANDA_IR_TS_INFER_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypeParameter; diff --git a/ir/ts/tsInterfaceBody.cpp b/ir/ts/tsInterfaceBody.cpp index 69a72a2b7030cfa0bcfda1c69a429bbc4b75cbfc..369391dfbdb71c1376337f0346fcae4f2b1c13bf 100644 --- a/ir/ts/tsInterfaceBody.cpp +++ b/ir/ts/tsInterfaceBody.cpp @@ -15,7 +15,7 @@ #include "tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void TSInterfaceBody::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsInterfaceBody.h b/ir/ts/tsInterfaceBody.h index d5fdb782bad03eb429ab10a2fb86d89256147c9a..7197e7c2fc6e9440d469836e1fadbbede6fa9160 100644 --- a/ir/ts/tsInterfaceBody.h +++ b/ir/ts/tsInterfaceBody.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_INTERFACE_BODY_H #define ES2PANDA_IR_TS_INTERFACE_BODY_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TSInterfaceBody : public Expression { diff --git a/ir/ts/tsInterfaceDeclaration.cpp b/ir/ts/tsInterfaceDeclaration.cpp index b44cd6e183f0280fbcbf88b78b50fa9cf9b6f2c1..f6060046e8c9ee2a1927a520d013400dd46bfd5f 100644 --- a/ir/ts/tsInterfaceDeclaration.cpp +++ b/ir/ts/tsInterfaceDeclaration.cpp @@ -15,18 +15,18 @@ #include "tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceHeritage.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" +#include "binder/declaration.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "checker/TSchecker.h" +#include "checker/ETSchecker.h" +#include "ir/astDump.h" +#include "ir/base/decorator.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsInterfaceBody.h" +#include "ir/ts/tsInterfaceHeritage.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterDeclaration.h" namespace panda::es2panda::ir { void TSInterfaceDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsInterfaceDeclaration.h b/ir/ts/tsInterfaceDeclaration.h index 9715935f2c7ca3ce3cf0c7d361ab8e6dbe092a04..be5c2d258cb966ab756f82d7befe38a115db23fc 100644 --- a/ir/ts/tsInterfaceDeclaration.h +++ b/ir/ts/tsInterfaceDeclaration.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_IR_TS_INTERFACE_DECLARATION_H #define ES2PANDA_IR_TS_INTERFACE_DECLARATION_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" -#include "plugins/ecmascript/es2panda/util/language.h" +#include "binder/scope.h" +#include "ir/statement.h" +#include "util/language.h" namespace panda::es2panda::binder { class Variable; diff --git a/ir/ts/tsInterfaceHeritage.cpp b/ir/ts/tsInterfaceHeritage.cpp index 128790c10fbe7862884327b130e69acb68a0cd11..19e92cbdc8ee8a07da21f8e09da820fe4342dc89 100644 --- a/ir/ts/tsInterfaceHeritage.cpp +++ b/ir/ts/tsInterfaceHeritage.cpp @@ -15,12 +15,12 @@ #include "tsInterfaceHeritage.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeReference.h" +#include "binder/scope.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "ir/ts/tsTypeReference.h" namespace panda::es2panda::ir { void TSInterfaceHeritage::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsInterfaceHeritage.h b/ir/ts/tsInterfaceHeritage.h index 9055cbc21fde270bde401228d8aa37f09a06f1d0..3ce89c33f764892c9d96e7b3b075d9b962265118 100644 --- a/ir/ts/tsInterfaceHeritage.h +++ b/ir/ts/tsInterfaceHeritage.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_INTERFACE_HERITAGE_H #define ES2PANDA_IR_TS_INTERFACE_HERITAGE_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/ts/tsIntersectionType.cpp b/ir/ts/tsIntersectionType.cpp index f0ed34c1b49c3118bb221a0e9afa848db93a4e86..4acbc734d18597e926e3f113cd0000df05624b8f 100644 --- a/ir/ts/tsIntersectionType.cpp +++ b/ir/ts/tsIntersectionType.cpp @@ -15,8 +15,8 @@ #include "tsIntersectionType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "ir/astDump.h" +#include "checker/ETSchecker.h" namespace panda::es2panda::ir { void TSIntersectionType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsIntersectionType.h b/ir/ts/tsIntersectionType.h index 68610c3de68ab91da926f30ae4ddc70f9633e837..7ed628faa41db80069289bf66613f79a967e215c 100644 --- a/ir/ts/tsIntersectionType.h +++ b/ir/ts/tsIntersectionType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_INTERSECTION_TYPE_H #define ES2PANDA_IR_TS_INTERSECTION_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSIntersectionType : public TypeNode { diff --git a/ir/ts/tsLiteralType.cpp b/ir/ts/tsLiteralType.cpp index bdfa1039607fcffc2e6347022f7b381868435287..08db35d343e5cac9a3331feac8c26e52e7f3408a 100644 --- a/ir/ts/tsLiteralType.cpp +++ b/ir/ts/tsLiteralType.cpp @@ -15,8 +15,8 @@ #include "tsLiteralType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSLiteralType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsLiteralType.h b/ir/ts/tsLiteralType.h index 024128027b8b530abf5735c8036951bb78bcc687..9569ef38287ecc0ec06c255bd23e81b7731a616b 100644 --- a/ir/ts/tsLiteralType.h +++ b/ir/ts/tsLiteralType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_LITERAL_TYPE_H #define ES2PANDA_IR_TS_LITERAL_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSLiteralType : public TypeNode { diff --git a/ir/ts/tsMappedType.cpp b/ir/ts/tsMappedType.cpp index f387f473d4338c90cd2dc0bdcd69a79c0f87cfdc..bc7946d3f40fd0bd8e3b493254ea84c7afdb7e7c 100644 --- a/ir/ts/tsMappedType.cpp +++ b/ir/ts/tsMappedType.cpp @@ -15,9 +15,9 @@ #include "tsMappedType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/ts/tsTypeParameter.h" namespace panda::es2panda::ir { void TSMappedType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsMappedType.h b/ir/ts/tsMappedType.h index d16d934b6b8e4ad8ed9a9b8ce1f5e5003acdc260..c2fe678170a84aa44e7233cf74eb2eaa2cee5430 100644 --- a/ir/ts/tsMappedType.h +++ b/ir/ts/tsMappedType.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_TS_MAPPED_TYPE_H #define ES2PANDA_IR_TS_MAPPED_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" +#include "ir/typeNode.h" +#include "ir/ts/tsTypeParameter.h" namespace panda::es2panda::ir { class TSMappedType : public TypeNode { diff --git a/ir/ts/tsModuleBlock.cpp b/ir/ts/tsModuleBlock.cpp index 436ea67de09f98d13f5ac39220afa422307b2056..4715d9bf3feac1e2bd876e5e0257a82304363d5d 100644 --- a/ir/ts/tsModuleBlock.cpp +++ b/ir/ts/tsModuleBlock.cpp @@ -15,8 +15,8 @@ #include "tsModuleBlock.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "binder/scope.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void TSModuleBlock::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsModuleBlock.h b/ir/ts/tsModuleBlock.h index 79da16dfa930cbeaabcbd30b13dbadd3f53c831e..66c99a269f782bf1ea220a0197de60436258c543 100644 --- a/ir/ts/tsModuleBlock.h +++ b/ir/ts/tsModuleBlock.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_TS_MODULE_BLOCK_H #define ES2PANDA_IR_TS_MODULE_BLOCK_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "binder/scope.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class TSModuleBlock : public Statement { diff --git a/ir/ts/tsModuleDeclaration.cpp b/ir/ts/tsModuleDeclaration.cpp index 264e1eef00c829a32a781243f3ac9dfe3f051ee6..beb7f336171cc024b9f0e88714294f0c581ad863 100644 --- a/ir/ts/tsModuleDeclaration.cpp +++ b/ir/ts/tsModuleDeclaration.cpp @@ -15,10 +15,10 @@ #include "tsModuleDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "binder/scope.h" +#include "ir/astDump.h" +#include "ir/base/decorator.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void TSModuleDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsModuleDeclaration.h b/ir/ts/tsModuleDeclaration.h index eebffb1f15ed5f1646001f29c2a4bac52ac6f1a9..e29019df0dd134f0b968517f2abdfb47640faf51 100644 --- a/ir/ts/tsModuleDeclaration.h +++ b/ir/ts/tsModuleDeclaration.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_TS_MODULE_DECLARATION_H #define ES2PANDA_IR_TS_MODULE_DECLARATION_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "binder/scope.h" +#include "ir/statement.h" namespace panda::es2panda::ir { class Expression; diff --git a/ir/ts/tsNamedTupleMember.cpp b/ir/ts/tsNamedTupleMember.cpp index a0b38f81f5f8618547126b52911422aeb13da786..e92c5787dd1c1560fff7125cae7888916bad6212 100644 --- a/ir/ts/tsNamedTupleMember.cpp +++ b/ir/ts/tsNamedTupleMember.cpp @@ -15,7 +15,7 @@ #include "tsNamedTupleMember.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void TSNamedTupleMember::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsNamedTupleMember.h b/ir/ts/tsNamedTupleMember.h index 5b64d8494986ae0789c98ef344af23099b40f549..a7266a6a42aa1137a9514a79f6ea3f38fb1bfcd0 100644 --- a/ir/ts/tsNamedTupleMember.h +++ b/ir/ts/tsNamedTupleMember.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_NAMED_TUPLE_MEMBER_TYPE_H #define ES2PANDA_IR_TS_NAMED_TUPLE_MEMBER_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSNamedTupleMember : public TypeNode { diff --git a/ir/ts/tsNeverKeyword.cpp b/ir/ts/tsNeverKeyword.cpp index a4dc8bb2d0d1201fa5a067d63df16c72ae9dcd8a..92b64c3dae72fe122fb79f48dee64df640dbc7dd 100644 --- a/ir/ts/tsNeverKeyword.cpp +++ b/ir/ts/tsNeverKeyword.cpp @@ -15,8 +15,8 @@ #include "tsNeverKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSNeverKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsNeverKeyword.h b/ir/ts/tsNeverKeyword.h index 9b18b9665019c1ebae419556f32fb81149a03481..20053e4aa2e1867b8afbc007fa250a07d3615612 100644 --- a/ir/ts/tsNeverKeyword.h +++ b/ir/ts/tsNeverKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_NEVER_KEYWORD_H #define ES2PANDA_IR_TS_NEVER_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSNeverKeyword : public TypeNode { diff --git a/ir/ts/tsNonNullExpression.cpp b/ir/ts/tsNonNullExpression.cpp index 4a5a1fb8d44dd8244c76fab21cd3931c6e03800d..4bbd98a68f59b86f64c1ec4f306fe5e25a38c0ca 100644 --- a/ir/ts/tsNonNullExpression.cpp +++ b/ir/ts/tsNonNullExpression.cpp @@ -15,9 +15,9 @@ #include "tsNonNullExpression.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/compiler/core/ETSGen.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "checker/ETSchecker.h" +#include "compiler/core/ETSGen.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void TSNonNullExpression::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsNonNullExpression.h b/ir/ts/tsNonNullExpression.h index 1f49e8343607aacf3ce7582e7116a7f1abb567be..22910a2211e31c8a723c6d1d2e871773678ecd52 100644 --- a/ir/ts/tsNonNullExpression.h +++ b/ir/ts/tsNonNullExpression.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_NON_NULL_EXPRESSION_H #define ES2PANDA_IR_TS_NON_NULL_EXPRESSION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TSNonNullExpression : public Expression { diff --git a/ir/ts/tsNullKeyword.cpp b/ir/ts/tsNullKeyword.cpp index e866c134270849a53b2520453a42d6142c2d72bf..49f02916f8439c5dcccab44cab1e9458e6c0f876 100644 --- a/ir/ts/tsNullKeyword.cpp +++ b/ir/ts/tsNullKeyword.cpp @@ -15,8 +15,8 @@ #include "tsNullKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSNullKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsNullKeyword.h b/ir/ts/tsNullKeyword.h index eb2c6a5fa3320a90aa878a9ab3d1bf48072ac30d..a443f194ed8276988fec7ef7d5892453b22f93d6 100644 --- a/ir/ts/tsNullKeyword.h +++ b/ir/ts/tsNullKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_NULL_KEYWORD_H #define ES2PANDA_IR_TS_NULL_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSNullKeyword : public TypeNode { diff --git a/ir/ts/tsNumberKeyword.cpp b/ir/ts/tsNumberKeyword.cpp index 63d4e24378a0aeb4575768c0ceaca0ff764868a7..294e15b549f5c62458c1e8322542441823f881ad 100644 --- a/ir/ts/tsNumberKeyword.cpp +++ b/ir/ts/tsNumberKeyword.cpp @@ -15,8 +15,8 @@ #include "tsNumberKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSNumberKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsNumberKeyword.h b/ir/ts/tsNumberKeyword.h index d18e27471e219f6e7f95ab3309cbd52fcce3e0f9..f9012741687d4613e41392c7af9b026847ad9e0a 100644 --- a/ir/ts/tsNumberKeyword.h +++ b/ir/ts/tsNumberKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_NUMBER_KEYWORD_H #define ES2PANDA_IR_TS_NUMBER_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSNumberKeyword : public TypeNode { diff --git a/ir/ts/tsObjectKeyword.cpp b/ir/ts/tsObjectKeyword.cpp index 423187ec25abb86df0579a0dd286463f7ab5adc9..eb471e9d7b1502b6ba6895968a7fc19c2d77e7c8 100644 --- a/ir/ts/tsObjectKeyword.cpp +++ b/ir/ts/tsObjectKeyword.cpp @@ -15,8 +15,8 @@ #include "tsObjectKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSObjectKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsObjectKeyword.h b/ir/ts/tsObjectKeyword.h index dc2d0dbeb8a95566678ecfe611b19b4447c081eb..d06a36dde29392f550497276e762ee1a3272e4aa 100644 --- a/ir/ts/tsObjectKeyword.h +++ b/ir/ts/tsObjectKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_OBJECT_KEYWORD_H #define ES2PANDA_IR_TS_OBJECT_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSObjectKeyword : public TypeNode { diff --git a/ir/ts/tsParameterProperty.cpp b/ir/ts/tsParameterProperty.cpp index 6d7c13c9f6af8bfd29c8fba4ebecf13687ef7b4b..d42b520c35bcbcce4200beb3a392c9d0b8cffed7 100644 --- a/ir/ts/tsParameterProperty.cpp +++ b/ir/ts/tsParameterProperty.cpp @@ -15,8 +15,8 @@ #include "tsParameterProperty.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/astDump.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void TSParameterProperty::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsParameterProperty.h b/ir/ts/tsParameterProperty.h index 631ef4c03a1b23d7d4a4df03b50d2a18c909e763..77b8fbb8321e61d3824d74d26d9521ba27fa5673 100644 --- a/ir/ts/tsParameterProperty.h +++ b/ir/ts/tsParameterProperty.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_TS_PARAMETER_PROPERTY_H #define ES2PANDA_IR_TS_PARAMETER_PROPERTY_H -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "ir/expression.h" +#include "lexer/token/tokenType.h" namespace panda::es2panda::ir { enum class AccessibilityOption { NO_OPTS, PUBLIC, PRIVATE, PROTECTED }; diff --git a/ir/ts/tsParenthesizedType.cpp b/ir/ts/tsParenthesizedType.cpp index 620da65d5915f7b4991ab21178de27537881993e..ba224d1c703a6ebaaa2c6849f46cf95149c8cb6f 100644 --- a/ir/ts/tsParenthesizedType.cpp +++ b/ir/ts/tsParenthesizedType.cpp @@ -15,8 +15,8 @@ #include "tsParenthesizedType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSParenthesizedType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsParenthesizedType.h b/ir/ts/tsParenthesizedType.h index 4d12d821b30b43bec31ad1556780f26049a94b3d..8175be39783728c45789a32e77b61bdbbac46367 100644 --- a/ir/ts/tsParenthesizedType.h +++ b/ir/ts/tsParenthesizedType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_PARENT_TYPE_H #define ES2PANDA_IR_TS_PARENT_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSParenthesizedType : public TypeNode { diff --git a/ir/ts/tsQualifiedName.cpp b/ir/ts/tsQualifiedName.cpp index 8c6d4fe5c21d32cb332f80b0b86256b951b85e63..0c1d5d4307dffa4cddeb88934562a1b89debb0a2 100644 --- a/ir/ts/tsQualifiedName.cpp +++ b/ir/ts/tsQualifiedName.cpp @@ -15,10 +15,10 @@ #include "tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "checker/ETSchecker.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { void TSQualifiedName::Iterate(const NodeTraverser &cb) const diff --git a/ir/ts/tsQualifiedName.h b/ir/ts/tsQualifiedName.h index 9bbb9349ea395573fae4de6d6aeadd695d91a90a..d86985550f2cc90ca759c94879b9767efee6a4a9 100644 --- a/ir/ts/tsQualifiedName.h +++ b/ir/ts/tsQualifiedName.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_QUALIFIED_NAME_H #define ES2PANDA_IR_TS_QUALIFIED_NAME_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TSQualifiedName : public Expression { diff --git a/ir/ts/tsStringKeyword.cpp b/ir/ts/tsStringKeyword.cpp index 4a4ca8b28087df252901c0cdbf38c3d2b4ffdc75..3374b8bb51d9eccd2a48ca08990eab939e65a420 100644 --- a/ir/ts/tsStringKeyword.cpp +++ b/ir/ts/tsStringKeyword.cpp @@ -15,8 +15,8 @@ #include "tsStringKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSStringKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsStringKeyword.h b/ir/ts/tsStringKeyword.h index 80e54ff6f2be4713d35485e19f164318c4597bab..14b8cf390d545b080368bce3979fa6622077265e 100644 --- a/ir/ts/tsStringKeyword.h +++ b/ir/ts/tsStringKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_STRING_KEYWORD_H #define ES2PANDA_IR_TS_STRING_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSStringKeyword : public TypeNode { diff --git a/ir/ts/tsThisType.cpp b/ir/ts/tsThisType.cpp index 8f2eaa24828bfed733840f3207bb595f795df694..445cf9b41fead0940e374ff2049be6f713bfe537 100644 --- a/ir/ts/tsThisType.cpp +++ b/ir/ts/tsThisType.cpp @@ -15,7 +15,7 @@ #include "tsThisType.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void TSThisType::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsThisType.h b/ir/ts/tsThisType.h index cf98a1f5c6a673c31c67769d3f8089b36f07f45b..0cbf2359b8ebfd1b9aaa3f358789b7ed6c662d39 100644 --- a/ir/ts/tsThisType.h +++ b/ir/ts/tsThisType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_THIS_TYPE_H #define ES2PANDA_IR_TS_THIS_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSThisType : public TypeNode { diff --git a/ir/ts/tsTupleType.cpp b/ir/ts/tsTupleType.cpp index b7d32316045df6330d52ba5b958cfeafcae4248c..6eebdc76a0c6dcd6078e364b485d21b54388223b 100644 --- a/ir/ts/tsTupleType.cpp +++ b/ir/ts/tsTupleType.cpp @@ -15,13 +15,13 @@ #include "tsTupleType.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/ts/indexInfo.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsNamedTupleMember.h" +#include "util/helpers.h" +#include "binder/scope.h" +#include "checker/TSchecker.h" +#include "checker/types/ts/indexInfo.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsNamedTupleMember.h" namespace panda::es2panda::ir { void TSTupleType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTupleType.h b/ir/ts/tsTupleType.h index b94744a90dc0d0ca63c46ec046f13e9fe1abbce8..53a70353970122c2d6e396eb051fca12060a1630 100644 --- a/ir/ts/tsTupleType.h +++ b/ir/ts/tsTupleType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TUPLE_TYPE_H #define ES2PANDA_IR_TS_TUPLE_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { enum class TSTupleKind { NONE, NAMED, DEFAULT }; diff --git a/ir/ts/tsTypeAliasDeclaration.cpp b/ir/ts/tsTypeAliasDeclaration.cpp index 7c0b4b167040315e9bc7981e9d63db0bb072cd13..d08e3640552262ae13dbc6578f85bcabbb805a89 100644 --- a/ir/ts/tsTypeAliasDeclaration.cpp +++ b/ir/ts/tsTypeAliasDeclaration.cpp @@ -15,14 +15,14 @@ #include "tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" +#include "binder/scope.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/base/decorator.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsTypeParameterDeclaration.h" namespace panda::es2panda::ir { void TSTypeAliasDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypeAliasDeclaration.h b/ir/ts/tsTypeAliasDeclaration.h index 9b090ba5b08636ac616ad9212a6522c0de8290f9..f38a2cb58c7d4c4a76954f37695eb08a9546952b 100644 --- a/ir/ts/tsTypeAliasDeclaration.h +++ b/ir/ts/tsTypeAliasDeclaration.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TYPE_ALIAS_DECLARATION_H #define ES2PANDA_IR_TS_TYPE_ALIAS_DECLARATION_H -#include "plugins/ecmascript/es2panda/ir/statement.h" +#include "ir/statement.h" namespace panda::es2panda::binder { class Variable; diff --git a/ir/ts/tsTypeAssertion.cpp b/ir/ts/tsTypeAssertion.cpp index 9a48d29ab95dfbc729a43b6175aed46e27f1adb9..7abafef59dd674c13b56afff9d9c3f9cf1db1f53 100644 --- a/ir/ts/tsTypeAssertion.cpp +++ b/ir/ts/tsTypeAssertion.cpp @@ -15,8 +15,8 @@ #include "tsTypeAssertion.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { void TSTypeAssertion::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypeAssertion.h b/ir/ts/tsTypeAssertion.h index ec0ac49c6eb1bff83726be59f9bdf1091a436f7e..e8a66171643a905828b5706ed661649c4cc7d29a 100644 --- a/ir/ts/tsTypeAssertion.h +++ b/ir/ts/tsTypeAssertion.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TYPE_ASSERTION_H #define ES2PANDA_IR_TS_TYPE_ASSERTION_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TSTypeAssertion : public AnnotatedExpression { diff --git a/ir/ts/tsTypeLiteral.cpp b/ir/ts/tsTypeLiteral.cpp index 6cdce5e296b0cfcf2684f56b01f98082431bdb57..17838b7a0c1b6263a155106bda4ce93dec743f6b 100644 --- a/ir/ts/tsTypeLiteral.cpp +++ b/ir/ts/tsTypeLiteral.cpp @@ -15,12 +15,12 @@ #include "tsTypeLiteral.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/checker/types/signature.h" +#include "binder/variable.h" +#include "binder/declaration.h" +#include "checker/TSchecker.h" +#include "checker/types/signature.h" namespace panda::es2panda::ir { void TSTypeLiteral::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypeLiteral.h b/ir/ts/tsTypeLiteral.h index b73097897b8fa481a1bc4228b44b31fe0eed68eb..9f0cb0a1b7e7c84449abb901d562a46bb8ce0588 100644 --- a/ir/ts/tsTypeLiteral.h +++ b/ir/ts/tsTypeLiteral.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TYPE_LITERAL_H #define ES2PANDA_IR_TS_TYPE_LITERAL_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypeLiteral : public TypeNode { diff --git a/ir/ts/tsTypeOperator.cpp b/ir/ts/tsTypeOperator.cpp index 0ca45370f561f05b05140cdc2529ab866e09e337..538bb29e5c1e02f67009fb9c7d39246f824e347f 100644 --- a/ir/ts/tsTypeOperator.cpp +++ b/ir/ts/tsTypeOperator.cpp @@ -15,7 +15,7 @@ #include "tsTypeOperator.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void TSTypeOperator::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypeOperator.h b/ir/ts/tsTypeOperator.h index 2475bc2babaf23d9d293d9bb849b2bbc8404b4b7..ea2b54e731bcedf5eefd34db174e0d33e1627385 100644 --- a/ir/ts/tsTypeOperator.h +++ b/ir/ts/tsTypeOperator.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TYPE_OPERATOR_H #define ES2PANDA_IR_TS_TYPE_OPERATOR_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypeOperator : public TypeNode { diff --git a/ir/ts/tsTypeParameter.cpp b/ir/ts/tsTypeParameter.cpp index 45e1ceef6e81dfeb9507b8917bf3272cd09d3283..3a92543a40cdfb2247589e3c2c787e35e15d31da 100644 --- a/ir/ts/tsTypeParameter.cpp +++ b/ir/ts/tsTypeParameter.cpp @@ -15,9 +15,9 @@ #include "tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/expressions/identifier.h" namespace panda::es2panda::ir { void TSTypeParameter::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypeParameter.h b/ir/ts/tsTypeParameter.h index 94e310e7538247ebe27f66f8687cd5b34f7a23c9..aaf9227a7bde0c896f7e7baae133907c323bcc35 100644 --- a/ir/ts/tsTypeParameter.h +++ b/ir/ts/tsTypeParameter.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TYPE_PARAMETER_H #define ES2PANDA_IR_TS_TYPE_PARAMETER_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class Identifier; diff --git a/ir/ts/tsTypeParameterDeclaration.cpp b/ir/ts/tsTypeParameterDeclaration.cpp index 204a9fa328076b8643772ca6b85a20efbdb12350..4039d1f16aba424b5392f040887da1fbe7ee4ce4 100644 --- a/ir/ts/tsTypeParameterDeclaration.cpp +++ b/ir/ts/tsTypeParameterDeclaration.cpp @@ -15,9 +15,9 @@ #include "tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" +#include "binder/scope.h" +#include "ir/astDump.h" +#include "ir/ts/tsTypeParameter.h" namespace panda::es2panda::ir { void TSTypeParameterDeclaration::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypeParameterDeclaration.h b/ir/ts/tsTypeParameterDeclaration.h index db00349a0658f08838e8e14ca7ba1bc1f2073d9b..d5c5b926ad6ec2d2b71165e1ecf5cec73c0b1f57 100644 --- a/ir/ts/tsTypeParameterDeclaration.h +++ b/ir/ts/tsTypeParameterDeclaration.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_TS_TYPE_PARAMETER_DECLARATION_H #define ES2PANDA_IR_TS_TYPE_PARAMETER_DECLARATION_H -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "binder/scope.h" +#include "ir/expression.h" namespace panda::es2panda::ir { class TSTypeParameter; diff --git a/ir/ts/tsTypeParameterInstantiation.cpp b/ir/ts/tsTypeParameterInstantiation.cpp index 3011d018199728e018bed3ace39994cffad5993f..ad6fbf20a9498ff5a5a250989316ceb3b7184661 100644 --- a/ir/ts/tsTypeParameterInstantiation.cpp +++ b/ir/ts/tsTypeParameterInstantiation.cpp @@ -15,9 +15,9 @@ #include "tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/astDump.h" +#include "ir/expression.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { void TSTypeParameterInstantiation::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypeParameterInstantiation.h b/ir/ts/tsTypeParameterInstantiation.h index 9b9eeb39dd3315a66082044721b73966846ee65f..8bc132d4863a93e9cb150fdb9fc87a88c1a5b32e 100644 --- a/ir/ts/tsTypeParameterInstantiation.h +++ b/ir/ts/tsTypeParameterInstantiation.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TYPE_PARAMETER_INSTANTIATION_H #define ES2PANDA_IR_TS_TYPE_PARAMETER_INSTANTIATION_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypeParameterInstantiation : public Expression { diff --git a/ir/ts/tsTypePredicate.cpp b/ir/ts/tsTypePredicate.cpp index d72dfa4bcd317718f549353ec3c49ec245369a21..c2896cd3e4ca36b54f793e6ea19dd1fcf96265aa 100644 --- a/ir/ts/tsTypePredicate.cpp +++ b/ir/ts/tsTypePredicate.cpp @@ -15,9 +15,9 @@ #include "tsTypePredicate.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/typeNode.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/astDump.h" +#include "ir/typeNode.h" +#include "ir/expression.h" namespace panda::es2panda::ir { void TSTypePredicate::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypePredicate.h b/ir/ts/tsTypePredicate.h index 201b320fb0abf712defb9419ff7b89978ba1f0e6..e32610b702250e528746ac92b77bfc86facdc6d8 100644 --- a/ir/ts/tsTypePredicate.h +++ b/ir/ts/tsTypePredicate.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TYPE_PREDICATE_H #define ES2PANDA_IR_TS_TYPE_PREDICATE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypePredicate : public TypeNode { diff --git a/ir/ts/tsTypeQuery.cpp b/ir/ts/tsTypeQuery.cpp index 4aa888c1e1d052f6f09e29e64635e5f6d3b7bba7..31752510bd7e9fe24b3430e04fd57fd37bdca930 100644 --- a/ir/ts/tsTypeQuery.cpp +++ b/ir/ts/tsTypeQuery.cpp @@ -15,8 +15,8 @@ #include "tsTypeQuery.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSTypeQuery::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypeQuery.h b/ir/ts/tsTypeQuery.h index 8be4b9e176d2ad6c24a9ef679ea62401bb260080..c4442a5902e46571a7151b9529613c0c94eebadd 100644 --- a/ir/ts/tsTypeQuery.h +++ b/ir/ts/tsTypeQuery.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TYPE_QUERY_H #define ES2PANDA_IR_TS_TYPE_QUERY_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSTypeQuery : public TypeNode { diff --git a/ir/ts/tsTypeReference.cpp b/ir/ts/tsTypeReference.cpp index abbd59cb8c90f779a342f6762f728a522a737b65..a1ccefd3968dc4bda2262c75d8d246c9bcdea35a 100644 --- a/ir/ts/tsTypeReference.cpp +++ b/ir/ts/tsTypeReference.cpp @@ -15,17 +15,17 @@ #include "tsTypeReference.h" -#include "plugins/ecmascript/es2panda/binder/declaration.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/variable.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" +#include "binder/declaration.h" +#include "binder/scope.h" +#include "binder/variable.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" +#include "ir/expressions/identifier.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsQualifiedName.h" namespace panda::es2panda::ir { void TSTypeReference::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsTypeReference.h b/ir/ts/tsTypeReference.h index e9e776d3be644485b09b352c64cc3db724218fa9..29c745bb74511f99403454315fa4fc6e02c1cb7e 100644 --- a/ir/ts/tsTypeReference.h +++ b/ir/ts/tsTypeReference.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_TYPE_REFERENCE_H #define ES2PANDA_IR_TS_TYPE_REFERENCE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::binder { class Variable; diff --git a/ir/ts/tsUndefinedKeyword.cpp b/ir/ts/tsUndefinedKeyword.cpp index dddf96ada6d6f8270cfe06a2bb320ee9e816ef7c..6d889996c82dab60fced9a83fd9230db62ce8c4d 100644 --- a/ir/ts/tsUndefinedKeyword.cpp +++ b/ir/ts/tsUndefinedKeyword.cpp @@ -15,8 +15,8 @@ #include "tsUndefinedKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSUndefinedKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsUndefinedKeyword.h b/ir/ts/tsUndefinedKeyword.h index 622e09ab03422d1939b317ee9dfd6202f93bf731..1dcc42d743a2803f468a43a8c3b008a09752eca3 100644 --- a/ir/ts/tsUndefinedKeyword.h +++ b/ir/ts/tsUndefinedKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_UNDEFINED_KEYWORD_H #define ES2PANDA_IR_TS_UNDEFINED_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSUndefinedKeyword : public TypeNode { diff --git a/ir/ts/tsUnionType.cpp b/ir/ts/tsUnionType.cpp index 97957e4f141a5d2b4b0b37248994b628b06288bc..c833b7f5b2858830ac29e5328676775c9235fa42 100644 --- a/ir/ts/tsUnionType.cpp +++ b/ir/ts/tsUnionType.cpp @@ -15,8 +15,8 @@ #include "tsUnionType.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" +#include "checker/TSchecker.h" +#include "ir/astDump.h" namespace panda::es2panda::ir { void TSUnionType::TransformChildren(const NodeTransformer &cb) diff --git a/ir/ts/tsUnionType.h b/ir/ts/tsUnionType.h index ec585bd79679679045ddf81380aa042a6421a621..65343e59e6483344f321f2c9c7d59ffed59f63c7 100644 --- a/ir/ts/tsUnionType.h +++ b/ir/ts/tsUnionType.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_UNION_TYPE_H #define ES2PANDA_IR_TS_UNION_TYPE_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSUnionType : public TypeNode { diff --git a/ir/ts/tsUnknownKeyword.cpp b/ir/ts/tsUnknownKeyword.cpp index 80391df93619eb5688e3ba27a0893f1ee7e23460..3799e4b62b1b288094101bfeda5d8b18558db5b7 100644 --- a/ir/ts/tsUnknownKeyword.cpp +++ b/ir/ts/tsUnknownKeyword.cpp @@ -15,8 +15,8 @@ #include "tsUnknownKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSUnknownKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsUnknownKeyword.h b/ir/ts/tsUnknownKeyword.h index 94e60352282b7e88ca4f35a9606e06193ffab300..0e912ca124800fd68f94ae4bf3a615cfadfdaec2 100644 --- a/ir/ts/tsUnknownKeyword.h +++ b/ir/ts/tsUnknownKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_UNKNOWN_KEYWORD_H #define ES2PANDA_IR_TS_UNKNOWN_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSUnknownKeyword : public TypeNode { diff --git a/ir/ts/tsVoidKeyword.cpp b/ir/ts/tsVoidKeyword.cpp index 0bbe953d2c51adbaa0c3759ec79f554278afb337..43417ff96ac18a52f86f0ea68ce7fded722ac217 100644 --- a/ir/ts/tsVoidKeyword.cpp +++ b/ir/ts/tsVoidKeyword.cpp @@ -15,8 +15,8 @@ #include "tsVoidKeyword.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/checker/TSchecker.h" +#include "ir/astDump.h" +#include "checker/TSchecker.h" namespace panda::es2panda::ir { void TSVoidKeyword::TransformChildren([[maybe_unused]] const NodeTransformer &cb) {} diff --git a/ir/ts/tsVoidKeyword.h b/ir/ts/tsVoidKeyword.h index 49598505c809d9548f6d16ca03073c73f93beb96..6a1d20d35d712a7631f8c1e483d6ae377c68048d 100644 --- a/ir/ts/tsVoidKeyword.h +++ b/ir/ts/tsVoidKeyword.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TS_VOID_KEYWORD_H #define ES2PANDA_IR_TS_VOID_KEYWORD_H -#include "plugins/ecmascript/es2panda/ir/typeNode.h" +#include "ir/typeNode.h" namespace panda::es2panda::ir { class TSVoidKeyword : public TypeNode { diff --git a/ir/typeNode.h b/ir/typeNode.h index e36d0d4ed62474b7e3e6e3d55296a1dc9fbd7125..e7b1f3b9dc0466c0063cfd9c8df7bb3a5b459cd4 100644 --- a/ir/typeNode.h +++ b/ir/typeNode.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_IR_TYPE_NODE_H #define ES2PANDA_IR_TYPE_NODE_H -#include "plugins/ecmascript/es2panda/ir/expression.h" +#include "ir/expression.h" namespace panda::es2panda::checker { class TSChecker; diff --git a/ir/validationInfo.h b/ir/validationInfo.h index 75b5e9cff2f2b9917279a88d5e411098d69ea73d..d8a844fada7e06fdb83dbb965cdd55e14ca7afd2 100644 --- a/ir/validationInfo.h +++ b/ir/validationInfo.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_IR_VALIDATION_INFO_H #define ES2PANDA_IR_VALIDATION_INFO_H -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "lexer/token/sourceLocation.h" +#include "util/ustring.h" namespace panda::es2panda::ir { class ValidationInfo { diff --git a/lexer/ASLexer.h b/lexer/ASLexer.h index 028a5c5a0ee402cc42e220d31cd413370190fa12..de0e800cd4999a6de8ade4252770264a0e705810 100644 --- a/lexer/ASLexer.h +++ b/lexer/ASLexer.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_CORE_AS_LEXER_H #define ES2PANDA_PARSER_CORE_AS_LEXER_H -#include "plugins/ecmascript/es2panda/lexer/lexer.h" +#include "lexer/lexer.h" namespace panda::es2panda::lexer { class ASLexer final : public Lexer { diff --git a/lexer/ETSLexer.h b/lexer/ETSLexer.h index af513f88aa0c7704de042055a58a41abf7996241..d5f5fd6b6128476d4c8bf3c71594d8de0be9dbcc 100644 --- a/lexer/ETSLexer.h +++ b/lexer/ETSLexer.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_CORE_ETS_LEXER_H #define ES2PANDA_PARSER_CORE_ETS_LEXER_H -#include "plugins/ecmascript/es2panda/lexer/lexer.h" +#include "lexer/lexer.h" namespace panda::es2panda::lexer { class ETSLexer final : public Lexer { diff --git a/lexer/TSLexer.h b/lexer/TSLexer.h index 98830e7b12050d7a33322d1f86149c99f9212fc8..2c729f2a594482fbe10d1fdf8c41d990ae9031f3 100644 --- a/lexer/TSLexer.h +++ b/lexer/TSLexer.h @@ -16,7 +16,7 @@ #ifndef ES2PANDA_PARSER_CORE_TS_LEXER_H #define ES2PANDA_PARSER_CORE_TS_LEXER_H -#include "plugins/ecmascript/es2panda/lexer/lexer.h" +#include "lexer/lexer.h" namespace panda::es2panda::lexer { class TSLexer final : public Lexer { diff --git a/lexer/keywordString.h b/lexer/keywordString.h index 88892ed64614595bdc0f0d2ddbe8f6d2216c8650..93eb4c305d439cf31f5b282b16154f75c1bf83e2 100644 --- a/lexer/keywordString.h +++ b/lexer/keywordString.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_PARSER_CORE_KEYWORD_STRING_H #define ES2PANDA_PARSER_CORE_KEYWORD_STRING_H -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "lexer/token/tokenType.h" #include "macros.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" namespace panda::es2panda::lexer { struct KeywordString { diff --git a/lexer/keywords.cpp b/lexer/keywords.cpp index b941cbdc3c78e86e1c99bea53d38422e137ca337..644732012505f7ff065925d498912d1f97879476 100644 --- a/lexer/keywords.cpp +++ b/lexer/keywords.cpp @@ -14,8 +14,8 @@ */ #include "generated/keywords.h" -#include "plugins/ecmascript/es2panda/lexer/keywordsUtil.h" -#include "plugins/ecmascript/es2panda/parser/context/parserContext.h" +#include "lexer/keywordsUtil.h" +#include "parser/context/parserContext.h" namespace panda::es2panda::lexer { diff --git a/lexer/keywordsBase.h b/lexer/keywordsBase.h index 7a51b40c6b31fb0d882e702d0d5ae7809ceb6b1b..f601167e8dbd45b699ebe0c03fab36b1d5b089f0 100644 --- a/lexer/keywordsBase.h +++ b/lexer/keywordsBase.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_LEXER_KEYWORDS_BASE_H #define ES2PANDA_LEXER_KEYWORDS_BASE_H -#include "plugins/ecmascript/es2panda/lexer/keywordString.h" -#include "plugins/ecmascript/es2panda/lexer/keywordsUtil.h" +#include "lexer/keywordString.h" +#include "lexer/keywordsUtil.h" #include "macros.h" namespace panda::es2panda::lexer { diff --git a/lexer/keywordsUtil.cpp b/lexer/keywordsUtil.cpp index b0227c280801ad1f982754f40efca9d9a132020e..1f6013579e2db0a9abb70f02b6967dc6959e96b2 100644 --- a/lexer/keywordsUtil.cpp +++ b/lexer/keywordsUtil.cpp @@ -16,9 +16,9 @@ #include "keywordsUtil.h" #include "generated/keywords.h" -#include "plugins/ecmascript/es2panda/lexer/lexer.h" +#include "lexer/lexer.h" #include "unicode/uchar.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "util/enumbitops.h" namespace panda::es2panda::lexer { enum class AsciiFlags : uint32_t { diff --git a/lexer/keywordsUtil.h b/lexer/keywordsUtil.h index 8ac2cf299ffe6fa6ec366bd02b6c1774c1355cba..055d14c2a0334f9e585c7ca1f51eb9c04e9c901f 100644 --- a/lexer/keywordsUtil.h +++ b/lexer/keywordsUtil.h @@ -16,12 +16,12 @@ #ifndef ES2PANDA_PARSER_CORE_KEYWORDS_UTIL_H #define ES2PANDA_PARSER_CORE_KEYWORDS_UTIL_H -#include "plugins/ecmascript/es2panda/lexer/keywordString.h" -#include "plugins/ecmascript/es2panda/lexer/lexer.h" -#include "plugins/ecmascript/es2panda/lexer/token/letters.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "lexer/keywordString.h" +#include "lexer/lexer.h" +#include "lexer/token/letters.h" +#include "lexer/token/tokenType.h" #include "macros.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" #include "utils/span.h" namespace panda::es2panda::lexer { diff --git a/lexer/lexer.cpp b/lexer/lexer.cpp index 69cf56f5644ca7e278574ddfabca3ab8dbc56b6a..ab7f4474dca04b6dbf4e35100571979dc02700dc 100644 --- a/lexer/lexer.cpp +++ b/lexer/lexer.cpp @@ -15,12 +15,12 @@ #include "lexer.h" -#include "plugins/ecmascript/es2panda/es2panda.h" +#include "es2panda.h" #include "generated/keywords.h" -#include "plugins/ecmascript/es2panda/lexer/token/letters.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" -#include "plugins/ecmascript/es2panda/parser/context/parserContext.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" +#include "lexer/token/letters.h" +#include "lexer/token/tokenType.h" +#include "parser/context/parserContext.h" +#include "parser/program/program.h" #include diff --git a/lexer/lexer.h b/lexer/lexer.h index 589da6647e90e4b4520d01d6aefe0917228c5b2b..96d5d5ec954727d4084519f85abe70bcea2592e6 100644 --- a/lexer/lexer.h +++ b/lexer/lexer.h @@ -16,10 +16,10 @@ #ifndef ES2PANDA_PARSER_CORE_LEXER_H #define ES2PANDA_PARSER_CORE_LEXER_H -#include "plugins/ecmascript/es2panda/lexer/regexp/regexp.h" -#include "plugins/ecmascript/es2panda/lexer/token/letters.h" -#include "plugins/ecmascript/es2panda/lexer/token/token.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "lexer/regexp/regexp.h" +#include "lexer/token/letters.h" +#include "lexer/token/token.h" +#include "util/enumbitops.h" namespace panda::es2panda::parser { class ParserContext; diff --git a/lexer/regexp/regexp.cpp b/lexer/regexp/regexp.cpp index d24a70a5f003a40728abfdf6ec538e05ccf134ab..1febe12059d19f458accb93e374eb295244595f0 100644 --- a/lexer/regexp/regexp.cpp +++ b/lexer/regexp/regexp.cpp @@ -15,7 +15,7 @@ #include "regexp.h" -#include "plugins/ecmascript/es2panda/lexer/token/letters.h" +#include "lexer/token/letters.h" #include "unicode/uchar.h" #include diff --git a/lexer/regexp/regexp.h b/lexer/regexp/regexp.h index bba60408f4512e4473cd6a0cecdb05ee0ec5a699..f2e0269375752a5aae07b2dd39e56b1be19e372f 100644 --- a/lexer/regexp/regexp.h +++ b/lexer/regexp/regexp.h @@ -16,8 +16,8 @@ #ifndef ES2PANDA_PARSER_CORE_REGEXP_H #define ES2PANDA_PARSER_CORE_REGEXP_H -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/enumbitops.h" +#include "util/ustring.h" #include diff --git a/lexer/templates/keywords.h.erb b/lexer/templates/keywords.h.erb index ee9fb7f8efd6291b6d16bd89de23fb81bd9d7109..67c37fed082498d1d3be402a6ca0ab8115f19cce 100644 --- a/lexer/templates/keywords.h.erb +++ b/lexer/templates/keywords.h.erb @@ -18,7 +18,7 @@ #ifndef ES2PANDA_LEXER_KEYWORDS_H #define ES2PANDA_LEXER_KEYWORDS_H -#include "plugins/ecmascript/es2panda/lexer/keywordsBase.h" +#include "lexer/keywordsBase.h" #include "utils/span.h" // NOLINTBEGIN(readability-identifier-naming) diff --git a/lexer/token/number.cpp b/lexer/token/number.cpp index 6a89ada2e9aa4459f0a784ec629cb668b2b47cb5..bb909d1c4bd7aced819a0e436c33aab3ad252264 100644 --- a/lexer/token/number.cpp +++ b/lexer/token/number.cpp @@ -14,7 +14,7 @@ */ #include "number.h" -#include "plugins/ecmascript/es2panda/lexer/lexer.h" +#include "lexer/lexer.h" #include #include diff --git a/lexer/token/number.h b/lexer/token/number.h index 965e08c792af293864b88b1c11fe1318e6fc19de..4ea4a7f52ce6d4a75dd933c97a15eb87823fc0fc 100644 --- a/lexer/token/number.h +++ b/lexer/token/number.h @@ -17,8 +17,8 @@ #define ES2PANDA_LEXER_TOKEN_NUMBER_H #include "macros.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "util/ustring.h" +#include "util/enumbitops.h" #include #include diff --git a/lexer/token/sourceLocation.cpp b/lexer/token/sourceLocation.cpp index e7164e958a52a5d5c9ae88977ab5a0388b59109f..109e4fd5bf3c10c8a34ec584122a0a75ad969654 100644 --- a/lexer/token/sourceLocation.cpp +++ b/lexer/token/sourceLocation.cpp @@ -15,7 +15,7 @@ #include "sourceLocation.h" -#include "plugins/ecmascript/es2panda/lexer/token/letters.h" +#include "lexer/token/letters.h" #include diff --git a/lexer/token/sourceLocation.h b/lexer/token/sourceLocation.h index 0b7634d5c9c8bc620df6185ea7418a4cb6a58c0a..eea31557ccdfb8bb09106499e8847b2a8a4914cf 100644 --- a/lexer/token/sourceLocation.h +++ b/lexer/token/sourceLocation.h @@ -17,7 +17,7 @@ #define ES2PANDA_LEXER_TOKEN_SOURCE_LOCATION_H #include "macros.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/ustring.h" #include #include diff --git a/lexer/token/token.h b/lexer/token/token.h index fa39b88d26bf6734116de2c2ea76adf42eca3268..860e5cbf4b5743e1d9c2a94a3735ca3d694c221f 100644 --- a/lexer/token/token.h +++ b/lexer/token/token.h @@ -16,12 +16,12 @@ #ifndef ES2PANDA_PARSER_CORE_TOKEN_H #define ES2PANDA_PARSER_CORE_TOKEN_H -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" -#include "plugins/ecmascript/es2panda/lexer/token/number.h" +#include "lexer/token/sourceLocation.h" +#include "lexer/token/tokenType.h" +#include "lexer/token/number.h" #include "macros.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/enumbitops.h" +#include "util/ustring.h" namespace panda::es2panda::lexer { enum class TokenFlags : uint32_t { diff --git a/parser/ASparser.cpp b/parser/ASparser.cpp index 4dc01b611dae9800461a34ce5e25ed1df6393d64..dc50f020435f33ec5d12e78e86c95a6afc2bd188 100644 --- a/parser/ASparser.cpp +++ b/parser/ASparser.cpp @@ -15,65 +15,65 @@ #include "ASparser.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/privateBinding.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/tsBinding.h" -#include "plugins/ecmascript/es2panda/lexer/ASLexer.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/classElement.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/module/importDefaultSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/exportDefaultDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportNamedDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrowFunctionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/templateLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/taggedTemplateExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/sequenceExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/bigIntLiteral.h" -#include "plugins/ecmascript/es2panda/ir/statements/emptyStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/ifStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/doWhileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/whileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/tryStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/breakStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/continueStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/throwStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/debuggerStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/labelledStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/functionDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/as/namedType.h" -#include "plugins/ecmascript/es2panda/ir/as/prefixAssertionExpression.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsNonNullExpression.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsAsExpression.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsModuleDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceHeritage.h" -#include "plugins/ecmascript/es2panda/ir/base/tsIndexSignature.h" -#include "plugins/ecmascript/es2panda/ir/base/tsMethodSignature.h" -#include "plugins/ecmascript/es2panda/ir/base/tsPropertySignature.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsClassImplements.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" +#include "util/helpers.h" +#include "binder/privateBinding.h" +#include "binder/scope.h" +#include "binder/tsBinding.h" +#include "lexer/ASLexer.h" +#include "ir/base/decorator.h" +#include "ir/base/property.h" +#include "ir/base/spreadElement.h" +#include "ir/base/classElement.h" +#include "ir/base/classDefinition.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/module/importDefaultSpecifier.h" +#include "ir/module/exportDefaultDeclaration.h" +#include "ir/module/exportNamedDeclaration.h" +#include "ir/module/importDeclaration.h" +#include "ir/expressions/arrowFunctionExpression.h" +#include "ir/expressions/templateLiteral.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/taggedTemplateExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/sequenceExpression.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/bigIntLiteral.h" +#include "ir/statements/emptyStatement.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/ifStatement.h" +#include "ir/statements/doWhileStatement.h" +#include "ir/statements/whileStatement.h" +#include "ir/statements/tryStatement.h" +#include "ir/statements/breakStatement.h" +#include "ir/statements/continueStatement.h" +#include "ir/statements/throwStatement.h" +#include "ir/statements/switchStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/statements/debuggerStatement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/labelledStatement.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/functionDeclaration.h" +#include "ir/as/namedType.h" +#include "ir/as/prefixAssertionExpression.h" +#include "ir/ts/tsFunctionType.h" +#include "ir/ts/tsNonNullExpression.h" +#include "ir/ts/tsAsExpression.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "ir/ts/tsModuleDeclaration.h" +#include "ir/ts/tsInterfaceHeritage.h" +#include "ir/base/tsIndexSignature.h" +#include "ir/base/tsMethodSignature.h" +#include "ir/base/tsPropertySignature.h" +#include "ir/ts/tsClassImplements.h" +#include "ir/ts/tsTypeParameterInstantiation.h" namespace panda::es2panda::parser { std::unique_ptr ASParser::InitLexer(const SourceFile &source_file) diff --git a/parser/ETSparser.cpp b/parser/ETSparser.cpp index 1aba964175ce5af1fa97554f8604a027849f4827..2cee81ad9902807953b4375e68b9bc869cbce14f 100644 --- a/parser/ETSparser.cpp +++ b/parser/ETSparser.cpp @@ -15,103 +15,103 @@ #include "ETSparser.h" -#include "plugins/ecmascript/es2panda/parser/parserFlags.h" -#include "plugins/ecmascript/es2panda/util/arktsconfig.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/util/language.h" -#include "plugins/ecmascript/es2panda/binder/privateBinding.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/lexer/lexer.h" -#include "plugins/ecmascript/es2panda/lexer/ETSLexer.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/etsEnumType.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/catchClause.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classStaticBlock.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/functionDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/expressionStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/sequenceExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/thisExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/superExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/newExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/updateExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrowFunctionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/unaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/yieldExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/awaitExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/bigIntLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/booleanLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/charLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/nullLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/templateLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/importDefaultSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/assertStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/emptyStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/ifStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/labelledStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/throwStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/tryStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/whileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/doWhileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/breakStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/continueStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/debuggerStatement.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsLaunchExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsClassLiteral.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsPrimitiveType.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsPackageDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsWildcardType.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewArrayInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewClassInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsNewMultiDimArrayInstanceExpression.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsScript.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsTypeReferencePart.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsImportSource.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsImportDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsStructDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/importNamespaceSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsAsExpression.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsImportEqualsDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsArrayType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsIntersectionType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceHeritage.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsClassImplements.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsNonNullExpression.h" +#include "parser/parserFlags.h" +#include "util/arktsconfig.h" +#include "util/helpers.h" +#include "util/language.h" +#include "binder/privateBinding.h" +#include "binder/scope.h" +#include "binder/ETSBinder.h" +#include "lexer/lexer.h" +#include "lexer/ETSLexer.h" +#include "checker/types/ets/etsEnumType.h" +#include "ir/astNode.h" +#include "ir/base/classDefinition.h" +#include "ir/base/decorator.h" +#include "ir/base/catchClause.h" +#include "ir/base/classProperty.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/classStaticBlock.h" +#include "ir/base/spreadElement.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/functionExpression.h" +#include "ir/statements/functionDeclaration.h" +#include "ir/statements/expressionStatement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/variableDeclaration.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/sequenceExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/thisExpression.h" +#include "ir/expressions/superExpression.h" +#include "ir/expressions/newExpression.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/updateExpression.h" +#include "ir/expressions/arrowFunctionExpression.h" +#include "ir/expressions/unaryExpression.h" +#include "ir/expressions/yieldExpression.h" +#include "ir/expressions/awaitExpression.h" +#include "ir/expressions/literals/bigIntLiteral.h" +#include "ir/expressions/literals/booleanLiteral.h" +#include "ir/expressions/literals/charLiteral.h" +#include "ir/expressions/literals/nullLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/templateLiteral.h" +#include "ir/expressions/objectExpression.h" +#include "ir/module/importDeclaration.h" +#include "ir/module/importDefaultSpecifier.h" +#include "ir/module/importSpecifier.h" +#include "ir/statements/assertStatement.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/emptyStatement.h" +#include "ir/statements/ifStatement.h" +#include "ir/statements/labelledStatement.h" +#include "ir/statements/switchStatement.h" +#include "ir/statements/throwStatement.h" +#include "ir/statements/tryStatement.h" +#include "ir/statements/whileStatement.h" +#include "ir/statements/doWhileStatement.h" +#include "ir/statements/breakStatement.h" +#include "ir/statements/continueStatement.h" +#include "ir/statements/debuggerStatement.h" +#include "ir/ets/etsLaunchExpression.h" +#include "ir/ets/etsClassLiteral.h" +#include "ir/ets/etsPrimitiveType.h" +#include "ir/ets/etsPackageDeclaration.h" +#include "ir/ets/etsWildcardType.h" +#include "ir/ets/etsNewArrayInstanceExpression.h" +#include "ir/ets/etsFunctionType.h" +#include "ir/ets/etsNewClassInstanceExpression.h" +#include "ir/ets/etsNewMultiDimArrayInstanceExpression.h" +#include "ir/ets/etsScript.h" +#include "ir/ets/etsTypeReference.h" +#include "ir/ets/etsTypeReferencePart.h" +#include "ir/ets/etsImportSource.h" +#include "ir/ets/etsImportDeclaration.h" +#include "ir/ets/etsStructDeclaration.h" +#include "ir/module/importNamespaceSpecifier.h" +#include "ir/ts/tsAsExpression.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "ir/ts/tsInterfaceBody.h" +#include "ir/ts/tsImportEqualsDeclaration.h" +#include "ir/ts/tsArrayType.h" +#include "ir/ts/tsQualifiedName.h" +#include "ir/ts/tsTypeReference.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsIntersectionType.h" +#include "ir/ts/tsInterfaceHeritage.h" +#include "ir/ts/tsFunctionType.h" +#include "ir/ts/tsClassImplements.h" +#include "ir/ts/tsEnumMember.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ts/tsNonNullExpression.h" #include "libpandabase/os/file.h" #include "libpandabase/utils/json_parser.h" #include "generated/signatures.h" diff --git a/parser/ETSparser.h b/parser/ETSparser.h index 4a3d972ccc88ab2b2b8cf1c35edef7a8a334a2a8..38de7b09f73e96de14f87ce2fd8e5b8113953c77 100644 --- a/parser/ETSparser.h +++ b/parser/ETSparser.h @@ -16,9 +16,9 @@ #ifndef ES2PANDA_PARSER_CORE_ETS_PARSER_H #define ES2PANDA_PARSER_CORE_ETS_PARSER_H -#include "plugins/ecmascript/es2panda/util/arktsconfig.h" +#include "util/arktsconfig.h" #include "TypedParser.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsParameterExpression.h" +#include "ir/ets/etsParameterExpression.h" namespace panda::es2panda::ir { class ETSPackageDeclaration; diff --git a/parser/TSparser.cpp b/parser/TSparser.cpp index 08f4c74db632075817888e79a6aeac3aa3b8b6a8..8a36b79c499bba94f6fba1b8fbe4b3104fecd257 100644 --- a/parser/TSparser.cpp +++ b/parser/TSparser.cpp @@ -15,104 +15,104 @@ #include "TSparser.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/privateBinding.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/tsBinding.h" -#include "plugins/ecmascript/es2panda/lexer/TSLexer.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/classElement.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/module/importDefaultSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/exportDefaultDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportAllDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportNamedDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/sequenceExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/templateLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/taggedTemplateExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrowFunctionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/yieldExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/bigIntLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/booleanLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/nullLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/statements/emptyStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/ifStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/doWhileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/whileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/tryStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/breakStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/continueStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/throwStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/debuggerStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/labelledStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/functionDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsLiteralType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsMappedType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsImportType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsThisType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsConditionalType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeOperator.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInferType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTupleType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsNamedTupleMember.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsIndexedAccessType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeQuery.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypePredicate.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeLiteral.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsArrayType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsUnionType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsIntersectionType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsAnyKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsUndefinedKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsVoidKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsNumberKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsStringKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsBooleanKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsBigintKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsUnknownKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsNullKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsNeverKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsObjectKeyword.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsFunctionType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsConstructorType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsParenthesizedType.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAssertion.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsAsExpression.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsNonNullExpression.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsModuleDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceHeritage.h" -#include "plugins/ecmascript/es2panda/ir/base/tsSignatureDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/base/tsIndexSignature.h" -#include "plugins/ecmascript/es2panda/ir/base/tsMethodSignature.h" -#include "plugins/ecmascript/es2panda/ir/base/tsPropertySignature.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsParameterProperty.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsClassImplements.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsImportEqualsDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsExternalModuleReference.h" +#include "util/helpers.h" +#include "binder/privateBinding.h" +#include "binder/scope.h" +#include "binder/tsBinding.h" +#include "lexer/TSLexer.h" +#include "ir/base/spreadElement.h" +#include "ir/base/decorator.h" +#include "ir/base/classElement.h" +#include "ir/base/classDefinition.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/module/importDefaultSpecifier.h" +#include "ir/module/exportDefaultDeclaration.h" +#include "ir/module/exportAllDeclaration.h" +#include "ir/module/exportNamedDeclaration.h" +#include "ir/module/importDeclaration.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/sequenceExpression.h" +#include "ir/expressions/templateLiteral.h" +#include "ir/expressions/taggedTemplateExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/arrowFunctionExpression.h" +#include "ir/expressions/yieldExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/literals/bigIntLiteral.h" +#include "ir/expressions/literals/booleanLiteral.h" +#include "ir/expressions/literals/nullLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/statements/emptyStatement.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/ifStatement.h" +#include "ir/statements/doWhileStatement.h" +#include "ir/statements/whileStatement.h" +#include "ir/statements/tryStatement.h" +#include "ir/statements/breakStatement.h" +#include "ir/statements/continueStatement.h" +#include "ir/statements/throwStatement.h" +#include "ir/statements/switchStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/statements/debuggerStatement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/labelledStatement.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/functionDeclaration.h" +#include "ir/ts/tsLiteralType.h" +#include "ir/ts/tsMappedType.h" +#include "ir/ts/tsImportType.h" +#include "ir/ts/tsThisType.h" +#include "ir/ts/tsConditionalType.h" +#include "ir/ts/tsTypeOperator.h" +#include "ir/ts/tsInferType.h" +#include "ir/ts/tsTupleType.h" +#include "ir/ts/tsNamedTupleMember.h" +#include "ir/ts/tsQualifiedName.h" +#include "ir/ts/tsIndexedAccessType.h" +#include "ir/ts/tsTypeQuery.h" +#include "ir/ts/tsTypeReference.h" +#include "ir/ts/tsTypePredicate.h" +#include "ir/ts/tsTypeLiteral.h" +#include "ir/ts/tsArrayType.h" +#include "ir/ts/tsUnionType.h" +#include "ir/ts/tsIntersectionType.h" +#include "ir/ts/tsAnyKeyword.h" +#include "ir/ts/tsUndefinedKeyword.h" +#include "ir/ts/tsVoidKeyword.h" +#include "ir/ts/tsNumberKeyword.h" +#include "ir/ts/tsStringKeyword.h" +#include "ir/ts/tsBooleanKeyword.h" +#include "ir/ts/tsBigintKeyword.h" +#include "ir/ts/tsUnknownKeyword.h" +#include "ir/ts/tsNullKeyword.h" +#include "ir/ts/tsNeverKeyword.h" +#include "ir/ts/tsObjectKeyword.h" +#include "ir/ts/tsFunctionType.h" +#include "ir/ts/tsConstructorType.h" +#include "ir/ts/tsParenthesizedType.h" +#include "ir/ts/tsTypeAssertion.h" +#include "ir/ts/tsAsExpression.h" +#include "ir/ts/tsNonNullExpression.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "ir/ts/tsModuleDeclaration.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "ir/ts/tsInterfaceHeritage.h" +#include "ir/base/tsSignatureDeclaration.h" +#include "ir/base/tsIndexSignature.h" +#include "ir/base/tsMethodSignature.h" +#include "ir/base/tsPropertySignature.h" +#include "ir/ts/tsParameterProperty.h" +#include "ir/ts/tsClassImplements.h" +#include "ir/ts/tsImportEqualsDeclaration.h" +#include "ir/ts/tsExternalModuleReference.h" namespace panda::es2panda::parser { std::unique_ptr TSParser::InitLexer(const SourceFile &source_file) diff --git a/parser/TypedParser.cpp b/parser/TypedParser.cpp index 667cac765a1dc0816df28f35112eacdf7629896c..240509d81ca6cdab64ae2dfa7524f71d7bbf14a4 100644 --- a/parser/TypedParser.cpp +++ b/parser/TypedParser.cpp @@ -15,46 +15,46 @@ #include "TypedParser.h" -#include "plugins/ecmascript/es2panda/binder/privateBinding.h" -#include "plugins/ecmascript/es2panda/binder/tsBinding.h" -#include "plugins/ecmascript/es2panda/lexer/lexer.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/tsPropertySignature.h" -#include "plugins/ecmascript/es2panda/ir/base/tsMethodSignature.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/tsIndexSignature.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/yieldExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrowFunctionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/sequenceExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/statement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsModuleDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsModuleBlock.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterInstantiation.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameterDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsQualifiedName.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeReference.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceHeritage.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsClassImplements.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAssertion.h" +#include "binder/privateBinding.h" +#include "binder/tsBinding.h" +#include "lexer/lexer.h" +#include "ir/base/classDefinition.h" +#include "ir/base/decorator.h" +#include "ir/base/spreadElement.h" +#include "ir/base/tsPropertySignature.h" +#include "ir/base/tsMethodSignature.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/tsIndexSignature.h" +#include "ir/base/scriptFunction.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/yieldExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/arrowFunctionExpression.h" +#include "ir/expressions/sequenceExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/functionExpression.h" +#include "ir/statement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/ts/tsModuleDeclaration.h" +#include "ir/ts/tsModuleBlock.h" +#include "ir/ts/tsInterfaceBody.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsEnumMember.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ts/tsTypeParameterInstantiation.h" +#include "ir/ts/tsTypeParameterDeclaration.h" +#include "ir/ts/tsTypeParameter.h" +#include "ir/ts/tsQualifiedName.h" +#include "ir/ts/tsTypeReference.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "ir/ts/tsInterfaceHeritage.h" +#include "ir/ts/tsClassImplements.h" +#include "ir/ts/tsTypeAssertion.h" namespace panda::es2panda::parser { diff --git a/parser/context/classPrivateContext.cpp b/parser/context/classPrivateContext.cpp index b07c463ef26ace13b0dbbac00cd19b5eae657187..83221107b434d15ca76fd881fbe93ab6139bfe37 100644 --- a/parser/context/classPrivateContext.cpp +++ b/parser/context/classPrivateContext.cpp @@ -15,10 +15,10 @@ #include "classPrivateContext.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/base/classElement.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" +#include "ir/expression.h" +#include "ir/expressions/identifier.h" +#include "ir/base/classElement.h" +#include "ir/base/methodDefinition.h" namespace panda::es2panda::parser { bool ClassPrivateContext::AddElement(const ir::ClassElement *elem) diff --git a/parser/context/classPrivateContext.h b/parser/context/classPrivateContext.h index 7053332654908e16b377df301ba23e90facf701d..6780524b424298013d103698b392f071005124a8 100644 --- a/parser/context/classPrivateContext.h +++ b/parser/context/classPrivateContext.h @@ -17,8 +17,8 @@ #define ES2PANDA_PARSER_CONTEXT_CLASS_PRIVATE_CONTEXT_H #include -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/enumbitops.h" +#include "util/ustring.h" #include diff --git a/parser/context/parserContext.cpp b/parser/context/parserContext.cpp index ab434849058864334e2997c4025cb95ec3f8d0e6..61be343a4dbbdb002612424783b4f5486cafa4a0 100644 --- a/parser/context/parserContext.cpp +++ b/parser/context/parserContext.cpp @@ -14,7 +14,7 @@ */ #include "parserContext.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" +#include "parser/program/program.h" #include diff --git a/parser/context/parserContext.h b/parser/context/parserContext.h index efae06d494882f327bd7ab1e9dfa3cc29e07d327..73f79c27dea1f511220d9e7df05ee4d9c46762d3 100644 --- a/parser/context/parserContext.h +++ b/parser/context/parserContext.h @@ -17,9 +17,9 @@ #define ES2PANDA_PARSER_CORE_PARSER_PRIVATE_CONTEXT_H #include "macros.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/language.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "util/enumbitops.h" +#include "util/language.h" +#include "util/ustring.h" #include diff --git a/parser/expressionParser.cpp b/parser/expressionParser.cpp index fe97a808b52743efbd24fc8ca36123732c7100c1..7849e38ab8a1a8955a0d4501feef5c9fe56019c0 100644 --- a/parser/expressionParser.cpp +++ b/parser/expressionParser.cpp @@ -13,60 +13,60 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" -#include "plugins/ecmascript/es2panda/parser/parserFlags.h" -#include "plugins/ecmascript/es2panda/compiler/core/compilerContext.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/decorator.h" -#include "plugins/ecmascript/es2panda/ir/base/metaProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/base/templateElement.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrowFunctionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/awaitExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/chainExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/classExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/conditionalExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/directEvalExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/importExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/bigIntLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/booleanLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/nullLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/regExpLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/charLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/newExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/omittedExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/sequenceExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/superExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/taggedTemplateExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/templateLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/thisExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/unaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/updateExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/yieldExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsAsExpression.h" -#include "plugins/ecmascript/es2panda/ir/validationInfo.h" -#include "plugins/ecmascript/es2panda/lexer/lexer.h" -#include "plugins/ecmascript/es2panda/lexer/regexp/regexp.h" -#include "plugins/ecmascript/es2panda/lexer/token/letters.h" -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" -#include "plugins/ecmascript/es2panda/lexer/token/token.h" +#include "lexer/token/tokenType.h" +#include "parser/parserFlags.h" +#include "compiler/core/compilerContext.h" +#include "ir/astNode.h" +#include "ir/base/classDefinition.h" +#include "ir/base/decorator.h" +#include "ir/base/metaProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/property.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/spreadElement.h" +#include "ir/base/templateElement.h" +#include "ir/expression.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/arrowFunctionExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/awaitExpression.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/chainExpression.h" +#include "ir/expressions/classExpression.h" +#include "ir/expressions/conditionalExpression.h" +#include "ir/expressions/directEvalExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/importExpression.h" +#include "ir/expressions/literals/bigIntLiteral.h" +#include "ir/expressions/literals/booleanLiteral.h" +#include "ir/expressions/literals/nullLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/regExpLiteral.h" +#include "ir/expressions/literals/charLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/newExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/omittedExpression.h" +#include "ir/expressions/sequenceExpression.h" +#include "ir/expressions/superExpression.h" +#include "ir/expressions/taggedTemplateExpression.h" +#include "ir/expressions/templateLiteral.h" +#include "ir/expressions/thisExpression.h" +#include "ir/expressions/unaryExpression.h" +#include "ir/expressions/updateExpression.h" +#include "ir/expressions/yieldExpression.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/ts/tsAsExpression.h" +#include "ir/validationInfo.h" +#include "lexer/lexer.h" +#include "lexer/regexp/regexp.h" +#include "lexer/token/letters.h" +#include "lexer/token/sourceLocation.h" +#include "lexer/token/token.h" #include "macros.h" #include diff --git a/parser/parserFlags.h b/parser/parserFlags.h index cab419b84a4e9c78bcc7d3f5abf460f1277ef72a..792114ad56d706b46972c37cd16270c3df4620e1 100644 --- a/parser/parserFlags.h +++ b/parser/parserFlags.h @@ -17,7 +17,7 @@ #define ES2PANDA_PARSER_PARSER_FLAGS_H #include -#include "plugins/ecmascript/es2panda/util/enumbitops.h" +#include "util/enumbitops.h" namespace panda::es2panda::parser { enum class LexicalScopeType { diff --git a/parser/parserImpl.cpp b/parser/parserImpl.cpp index 2968cca6dbe6229cf2e31bc491b1b4fc6673d644..1af0e9eea5a09817bdaf48ad19a40f8943381ede 100644 --- a/parser/parserImpl.cpp +++ b/parser/parserImpl.cpp @@ -15,43 +15,43 @@ #include "parserImpl.h" -#include "plugins/ecmascript/es2panda/binder/privateBinding.h" -#include "plugins/ecmascript/es2panda/binder/scope.h" -#include "plugins/ecmascript/es2panda/binder/tsBinding.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/classStaticBlock.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/callExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/bigIntLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/booleanLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/nullLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/memberExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/superExpression.h" -#include "plugins/ecmascript/es2panda/ir/module/exportDefaultDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportNamedDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/emptyStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/expressionStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/functionDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/lexer/lexer.h" -#include "plugins/ecmascript/es2panda/lexer/token/letters.h" -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" +#include "binder/privateBinding.h" +#include "binder/scope.h" +#include "binder/tsBinding.h" +#include "ir/astDump.h" +#include "ir/astNode.h" +#include "ir/base/classDefinition.h" +#include "ir/base/classProperty.h" +#include "ir/base/classStaticBlock.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/property.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/spreadElement.h" +#include "ir/expression.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/callExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/bigIntLiteral.h" +#include "ir/expressions/literals/booleanLiteral.h" +#include "ir/expressions/literals/nullLiteral.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/memberExpression.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/superExpression.h" +#include "ir/module/exportDefaultDeclaration.h" +#include "ir/module/exportNamedDeclaration.h" +#include "ir/module/exportSpecifier.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/emptyStatement.h" +#include "ir/statements/expressionStatement.h" +#include "ir/statements/functionDeclaration.h" +#include "ir/statements/classDeclaration.h" +#include "lexer/lexer.h" +#include "lexer/token/letters.h" +#include "lexer/token/sourceLocation.h" using namespace std::literals::string_literals; diff --git a/parser/parserImpl.h b/parser/parserImpl.h index 2276f7a01e43598acfb25b6b16eda266668a8e7c..e680020b4db286c6e315cb61926509e77b38cc17 100644 --- a/parser/parserImpl.h +++ b/parser/parserImpl.h @@ -16,19 +16,19 @@ #ifndef ES2PANDA_PARSER_CORE_PARSER_IMPL_H #define ES2PANDA_PARSER_CORE_PARSER_IMPL_H -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/es2panda.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" -#include "plugins/ecmascript/es2panda/lexer/token/tokenType.h" +#include "binder/binder.h" +#include "es2panda.h" +#include "ir/astNode.h" +#include "lexer/token/sourceLocation.h" +#include "lexer/token/tokenType.h" #include "macros.h" #include "mem/arena_allocator.h" -#include "plugins/ecmascript/es2panda/parser/context/classPrivateContext.h" -#include "plugins/ecmascript/es2panda/parser/context/parserContext.h" -#include "plugins/ecmascript/es2panda/parser/parserFlags.h" -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/util/enumbitops.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "parser/context/classPrivateContext.h" +#include "parser/context/parserContext.h" +#include "parser/parserFlags.h" +#include "parser/program/program.h" +#include "util/enumbitops.h" +#include "util/ustring.h" #include #include diff --git a/parser/program/program.cpp b/parser/program/program.cpp index 8b149df7922ce61f934a0e5d4e6c45feaf95214a..f6ec7d2bace95237dbc1488a1bad67e847538669 100644 --- a/parser/program/program.cpp +++ b/parser/program/program.cpp @@ -15,11 +15,11 @@ #include "program.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" -#include "plugins/ecmascript/es2panda/binder/ETSBinder.h" -#include "plugins/ecmascript/es2panda/ir/astDump.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" +#include "binder/binder.h" +#include "binder/ETSBinder.h" +#include "ir/astDump.h" +#include "ir/base/classDefinition.h" +#include "ir/statements/blockStatement.h" namespace panda::es2panda::parser { diff --git a/parser/program/program.h b/parser/program/program.h index 5c7bd6c4cabbbc46606f17510f55c23bd96deb23..4f10782903955fec60aae2758064e9be2f928140 100644 --- a/parser/program/program.h +++ b/parser/program/program.h @@ -19,10 +19,10 @@ #include "macros.h" #include "mem/pool_manager.h" #include "os/filesystem.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/binder/binder.h" +#include "util/ustring.h" +#include "binder/binder.h" -#include "plugins/ecmascript/es2panda/es2panda.h" +#include "es2panda.h" namespace panda::es2panda::ir { class BlockStatement; diff --git a/parser/statementParser.cpp b/parser/statementParser.cpp index 6ac476a1984737b6046588834fc2c4c3ec80d9dd..a7f124fe07623fc0369307f2b0dc8020a8373189 100644 --- a/parser/statementParser.cpp +++ b/parser/statementParser.cpp @@ -13,58 +13,58 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/parser/parserFlags.h" -#include "plugins/ecmascript/es2panda/util/helpers.h" -#include "plugins/ecmascript/es2panda/binder/tsBinding.h" -#include "plugins/ecmascript/es2panda/ir/astNode.h" -#include "plugins/ecmascript/es2panda/ir/base/catchClause.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/expression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/binaryExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/conditionalExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/sequenceExpression.h" -#include "plugins/ecmascript/es2panda/ir/module/exportAllDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportDefaultDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportNamedDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/exportSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/module/importDefaultSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importNamespaceSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/module/importSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/assertStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/breakStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/continueStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/debuggerStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/doWhileStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/emptyStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/expressionStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/forInStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/forOfStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/forUpdateStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/functionDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/ifStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/labelledStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/returnStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchCaseStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/switchStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/throwStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/tryStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/statements/whileStatement.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsStructDeclaration.h" -#include "plugins/ecmascript/es2panda/lexer/keywordsBase.h" -#include "plugins/ecmascript/es2panda/lexer/lexer.h" -#include "plugins/ecmascript/es2panda/lexer/token/letters.h" -#include "plugins/ecmascript/es2panda/lexer/token/sourceLocation.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" +#include "parser/parserFlags.h" +#include "util/helpers.h" +#include "binder/tsBinding.h" +#include "ir/astNode.h" +#include "ir/base/catchClause.h" +#include "ir/base/classDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/expression.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/binaryExpression.h" +#include "ir/expressions/conditionalExpression.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/objectExpression.h" +#include "ir/expressions/sequenceExpression.h" +#include "ir/module/exportAllDeclaration.h" +#include "ir/module/exportDefaultDeclaration.h" +#include "ir/module/exportNamedDeclaration.h" +#include "ir/module/exportSpecifier.h" +#include "ir/module/importDeclaration.h" +#include "ir/module/importDefaultSpecifier.h" +#include "ir/module/importNamespaceSpecifier.h" +#include "ir/module/importSpecifier.h" +#include "ir/statements/assertStatement.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/breakStatement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/statements/continueStatement.h" +#include "ir/statements/debuggerStatement.h" +#include "ir/statements/doWhileStatement.h" +#include "ir/statements/emptyStatement.h" +#include "ir/statements/expressionStatement.h" +#include "ir/statements/forInStatement.h" +#include "ir/statements/forOfStatement.h" +#include "ir/statements/forUpdateStatement.h" +#include "ir/statements/functionDeclaration.h" +#include "ir/statements/ifStatement.h" +#include "ir/statements/labelledStatement.h" +#include "ir/statements/returnStatement.h" +#include "ir/statements/switchCaseStatement.h" +#include "ir/statements/switchStatement.h" +#include "ir/statements/throwStatement.h" +#include "ir/statements/tryStatement.h" +#include "ir/statements/variableDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/statements/whileStatement.h" +#include "ir/ets/etsStructDeclaration.h" +#include "lexer/keywordsBase.h" +#include "lexer/lexer.h" +#include "lexer/token/letters.h" +#include "lexer/token/sourceLocation.h" +#include "util/ustring.h" #include diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e040a2f66e0cd36fdb0dabd009529ba760714441..c1c19e410a6e72164dd00e06ff257b4dd72fa4c4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -21,6 +21,8 @@ if(NOT DEFINED ES2PANDA_REGRESSION_TESTS_GROUPS) set(ES2PANDA_REGRESSION_TESTS_GROUPS 32) endif() +add_custom_target(es2panda_tests COMMENT "Running es2panda test suites") + if(PANDA_WITH_ETS) set(ETS_RESULT_FOLDER ${CMAKE_BINARY_DIR}/tests/es2panda-regression-tests) set(OPTIONS --parser @@ -42,6 +44,10 @@ if(PANDA_WITH_ETS) endif() endif() + if(NOT PANDA_WITH_ECMASCRIPT) + set(OPTIONS --no-js ${OPTIONS}) + endif() + add_custom_target(es2panda-regression-tests COMMENT "Running es2panda-regression-tests test suites") foreach(CURRENT_GROUP RANGE 1 ${ES2PANDA_REGRESSION_TESTS_GROUPS}) add_custom_target(es2panda-regression-tests-${CURRENT_GROUP} @@ -56,9 +62,7 @@ if(PANDA_WITH_ETS) add_dependencies(es2panda-regression-tests es2panda-regression-tests-${CURRENT_GROUP}) endforeach() - add_custom_target(es2panda_tests COMMENT "Running es2panda test suites") add_dependencies(es2panda_tests es2panda-regression-tests) - add_dependencies(ecmascript_tests es2panda_tests) if(TARGET ets_tests) add_dependencies(ets_tests es2panda_tests) endif() diff --git a/test/tsconfig/CMakeLists.txt b/test/tsconfig/CMakeLists.txt index cf08d7354ffc0ec92bcdd33c5565e9c09afc6435..a4eaa7e6c2a9dde0f84fb15295d1d0fa70495d1f 100644 --- a/test/tsconfig/CMakeLists.txt +++ b/test/tsconfig/CMakeLists.txt @@ -16,7 +16,7 @@ function(add_es2panda_tsconfig_test tsproject) add_custom_target(${TSPROJECT_TARGET_NAME} DEPENDS es2panda WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - COMMAND ./test.sh $ ${tsproject} '${PANDA_RUN_PREFIX}' + COMMAND ./test.sh $ ${tsproject} '${PANDA_RUN_PREFIX}' '${PANDA_ROOT}' ) add_dependencies(es2panda_tests ${TSPROJECT_TARGET_NAME}) endfunction() diff --git a/test/tsconfig/test.sh b/test/tsconfig/test.sh index ef6f2841494b7cdb5b10a73a19e18cded35483b1..f24fcb203fde5dab8c0c360e1ef4eeea8bf3e696 100755 --- a/test/tsconfig/test.sh +++ b/test/tsconfig/test.sh @@ -22,6 +22,7 @@ PANDA_RUN_PREFIX="$3" TSCONFIG="$TSCONFIG_DIR"/tsconfig.json EXPECTED="$TSCONFIG_DIR"/expected.txt BUILD="$TSCONFIG_DIR"/build +PANDA_ROOT="$4" ensure_exists "$TSCONFIG" ensure_exists "$ES2PANDA" @@ -30,7 +31,7 @@ ensure_exists "$EXPECTED" rm -rf "$BUILD" ACTUAL=$(mktemp /tmp/actual.XXXXXX) -STDLIB="$SCRIPT_DIR/../../../../ets/stdlib" +STDLIB="$PANDA_ROOT/plugins/ets/stdlib" CMD="$PANDA_RUN_PREFIX $ES2PANDA --stdlib=$STDLIB --arktsconfig=$TSCONFIG" $CMD 2> /dev/null pushd "$TSCONFIG_DIR" &> /dev/null diff --git a/util/arktsconfig.cpp b/util/arktsconfig.cpp index cc1032a5a8a080a0dc0482929d291ad3e626a929..1d884ac64af37ac126706a5643ab9d4f814c655c 100644 --- a/util/arktsconfig.cpp +++ b/util/arktsconfig.cpp @@ -17,7 +17,7 @@ #include "libpandabase/utils/json_builder.h" #include "libpandabase/utils/json_parser.h" #include "libpandabase/os/filesystem.h" -#include "plugins/ecmascript/es2panda/util/language.h" +#include "util/language.h" #include "generated/signatures.h" #include diff --git a/util/arktsconfig.h b/util/arktsconfig.h index 4005515e0fb94f793b648fafb09ff3fb43600483..8e936fb19ce7f2571c588a46a12eb94c80c23881 100644 --- a/util/arktsconfig.h +++ b/util/arktsconfig.h @@ -21,7 +21,7 @@ #include #include -#include "plugins/ecmascript/es2panda/util/language.h" +#include "util/language.h" // TODO(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/util/declgenEts2Ts.cpp b/util/declgenEts2Ts.cpp index 2bc7da605f836aff00c8abf0c7f798e55d691dcb..04d61cad2e366a818f229f652c2e8e518644c593 100644 --- a/util/declgenEts2Ts.cpp +++ b/util/declgenEts2Ts.cpp @@ -15,21 +15,21 @@ #include "declgenEts2Ts.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsImportDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsPrimitiveType.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/module/importSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/statements/blockStatement.h" -#include "plugins/ecmascript/es2panda/ir/statements/classDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsClassImplements.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumMember.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceBody.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeAliasDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsTypeParameter.h" +#include "ir/base/classProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/scriptFunction.h" +#include "ir/ets/etsImportDeclaration.h" +#include "ir/ets/etsPrimitiveType.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/module/importSpecifier.h" +#include "ir/statements/blockStatement.h" +#include "ir/statements/classDeclaration.h" +#include "ir/ts/tsClassImplements.h" +#include "ir/ts/tsEnumMember.h" +#include "ir/ts/tsInterfaceBody.h" +#include "ir/ts/tsTypeAliasDeclaration.h" +#include "ir/ts/tsTypeParameter.h" #define DEBUG_PRINT 0 diff --git a/util/declgenEts2Ts.h b/util/declgenEts2Ts.h index a0d54fddc432335b1954a0501605d00e6b63b49e..7256080d30c1dce9555d81eb9cd43f445fe4983a 100644 --- a/util/declgenEts2Ts.h +++ b/util/declgenEts2Ts.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "plugins/ecmascript/es2panda/parser/program/program.h" -#include "plugins/ecmascript/es2panda/checker/ETSchecker.h" +#include "parser/program/program.h" +#include "checker/ETSchecker.h" #include "libpandabase/os/file.h" #ifndef ES2PANDA_UTIL_DECLGEN_ETS2TS_H diff --git a/util/helpers.cpp b/util/helpers.cpp index 6c1ae8d31f2d439bd9cdaa69d7f524e66c6cc44b..94996b7a45158d887c8334b83cfd97cc4748d191 100644 --- a/util/helpers.cpp +++ b/util/helpers.cpp @@ -15,33 +15,33 @@ #include "helpers.h" -#include "plugins/ecmascript/es2panda/binder/privateBinding.h" -#include "plugins/ecmascript/es2panda/checker/types/ets/types.h" -#include "plugins/ecmascript/es2panda/ir/base/classDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/classProperty.h" -#include "plugins/ecmascript/es2panda/ir/base/methodDefinition.h" -#include "plugins/ecmascript/es2panda/ir/base/property.h" -#include "plugins/ecmascript/es2panda/ir/base/scriptFunction.h" -#include "plugins/ecmascript/es2panda/ir/base/spreadElement.h" -#include "plugins/ecmascript/es2panda/ir/expressions/arrayExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/assignmentExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/functionExpression.h" -#include "plugins/ecmascript/es2panda/ir/expressions/identifier.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/numberLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/stringLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/booleanLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/literals/nullLiteral.h" -#include "plugins/ecmascript/es2panda/ir/expressions/objectExpression.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/statements/variableDeclarator.h" -#include "plugins/ecmascript/es2panda/ir/module/importSpecifier.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsImportDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsParameterProperty.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsInterfaceDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ts/tsEnumDeclaration.h" -#include "plugins/ecmascript/es2panda/ir/ets/etsParameterExpression.h" -#include "plugins/ecmascript/es2panda/ir/module/importDeclaration.h" -#include "plugins/ecmascript/es2panda/lexer/token/letters.h" +#include "binder/privateBinding.h" +#include "checker/types/ets/types.h" +#include "ir/base/classDefinition.h" +#include "ir/base/classProperty.h" +#include "ir/base/methodDefinition.h" +#include "ir/base/property.h" +#include "ir/base/scriptFunction.h" +#include "ir/base/spreadElement.h" +#include "ir/expressions/arrayExpression.h" +#include "ir/expressions/assignmentExpression.h" +#include "ir/expressions/functionExpression.h" +#include "ir/expressions/identifier.h" +#include "ir/expressions/literals/numberLiteral.h" +#include "ir/expressions/literals/stringLiteral.h" +#include "ir/expressions/literals/booleanLiteral.h" +#include "ir/expressions/literals/nullLiteral.h" +#include "ir/expressions/objectExpression.h" +#include "ir/statements/variableDeclaration.h" +#include "ir/statements/variableDeclarator.h" +#include "ir/module/importSpecifier.h" +#include "ir/ets/etsImportDeclaration.h" +#include "ir/ts/tsParameterProperty.h" +#include "ir/ts/tsInterfaceDeclaration.h" +#include "ir/ts/tsEnumDeclaration.h" +#include "ir/ets/etsParameterExpression.h" +#include "ir/module/importDeclaration.h" +#include "lexer/token/letters.h" #include #include diff --git a/util/helpers.h b/util/helpers.h index 6ac217f912a688fb3591f2e24ef8c86d7e61e375..36984748bba147245883fed21d340c4861c4bd12 100644 --- a/util/helpers.h +++ b/util/helpers.h @@ -16,10 +16,10 @@ #ifndef ES2PANDA_UTIL_HELPERS_H #define ES2PANDA_UTIL_HELPERS_H -#include "plugins/ecmascript/es2panda/binder/variableFlags.h" +#include "binder/variableFlags.h" #include "mem/pool_manager.h" -#include "plugins/ecmascript/es2panda/util/ustring.h" -#include "plugins/ecmascript/es2panda/ir/module/importSpecifier.h" +#include "util/ustring.h" +#include "ir/module/importSpecifier.h" #include #include