From 691ca6972be30b05e29e566c1a812a10ee3dfc10 Mon Sep 17 00:00:00 2001 From: Vsevolod Pukhov Date: Fri, 29 Sep 2023 17:53:32 +0300 Subject: [PATCH] Allow es2panda build with disabled ecmascript Signed-off-by: Vsevolod Pukhov --- BUILD.gn | 4 +- aot/BUILD.gn | 7 +- aot/CMakeLists.txt | 1 + aot/main.cpp | 4 +- aot/options.cpp | 7 + aot/options.h | 4 +- binder/ASBinder.h | 2 +- binder/ETSBinder.cpp | 86 +++--- binder/ETSBinder.h | 6 +- binder/JSBinder.h | 2 +- binder/TSBinder.h | 2 +- binder/TypedBinder.cpp | 10 +- binder/TypedBinder.h | 2 +- binder/binder.cpp | 84 +++--- binder/binder.h | 6 +- binder/declaration.h | 4 +- binder/enumMemberResult.h | 2 +- binder/privateBinding.h | 2 +- binder/recordTable.cpp | 12 +- binder/recordTable.h | 4 +- binder/scope.cpp | 48 ++-- binder/scope.h | 10 +- binder/tsBinding.h | 2 +- binder/variable.cpp | 2 +- binder/variable.h | 8 +- binder/variableFlags.h | 2 +- checker/ASchecker.cpp | 2 +- checker/ASchecker.h | 2 +- checker/ETSchecker.cpp | 22 +- checker/ETSchecker.h | 26 +- checker/JSchecker.cpp | 4 +- checker/JSchecker.h | 2 +- checker/TSchecker.cpp | 4 +- checker/TSchecker.h | 12 +- checker/checker.cpp | 24 +- checker/checker.h | 12 +- checker/checkerContext.h | 4 +- checker/ets/aliveAnalyzer.cpp | 64 ++--- checker/ets/aliveAnalyzer.h | 4 +- checker/ets/arithmetic.cpp | 10 +- checker/ets/arithmetic.h | 4 +- checker/ets/baseAnalyzer.cpp | 6 +- checker/ets/baseAnalyzer.h | 2 +- checker/ets/boxingConverter.cpp | 8 +- checker/ets/boxingConverter.h | 4 +- checker/ets/castingContext.h | 4 +- checker/ets/conversion.cpp | 8 +- checker/ets/conversion.h | 4 +- checker/ets/dynamic.cpp | 58 ++-- checker/ets/enum.cpp | 64 ++--- checker/ets/function.cpp | 86 +++--- checker/ets/helpers.cpp | 106 +++---- checker/ets/narrowingConverter.h | 6 +- checker/ets/narrowingWideningConverter.h | 4 +- checker/ets/object.cpp | 82 +++--- checker/ets/primitiveWrappers.h | 2 +- checker/ets/typeConverter.h | 2 +- checker/ets/typeCreation.cpp | 26 +- checker/ets/typeRelationContext.cpp | 14 +- checker/ets/typeRelationContext.h | 14 +- checker/ets/unboxingConverter.cpp | 6 +- checker/ets/unboxingConverter.h | 4 +- checker/ets/wideningConverter.h | 4 +- checker/ts/binaryLikeExpression.cpp | 6 +- checker/ts/destructuringContext.cpp | 20 +- checker/ts/destructuringContext.h | 4 +- checker/ts/function.cpp | 48 ++-- checker/ts/helpers.cpp | 38 +-- checker/ts/object.cpp | 46 ++-- checker/ts/typeCreation.cpp | 4 +- checker/ts/typeElaborationContext.cpp | 18 +- checker/ts/typeElaborationContext.h | 4 +- checker/ts/util.cpp | 12 +- checker/types/ets/byteType.cpp | 4 +- checker/types/ets/byteType.h | 2 +- checker/types/ets/charType.cpp | 4 +- checker/types/ets/charType.h | 2 +- checker/types/ets/doubleType.cpp | 4 +- checker/types/ets/doubleType.h | 2 +- checker/types/ets/etsArrayType.cpp | 8 +- checker/types/ets/etsArrayType.h | 2 +- checker/types/ets/etsAsyncFuncReturnType.cpp | 6 +- checker/types/ets/etsAsyncFuncReturnType.h | 2 +- checker/types/ets/etsBooleanType.cpp | 4 +- checker/types/ets/etsBooleanType.h | 2 +- checker/types/ets/etsDynamicFunctionType.h | 4 +- checker/types/ets/etsDynamicType.cpp | 4 +- checker/types/ets/etsDynamicType.h | 2 +- checker/types/ets/etsEnumType.cpp | 12 +- checker/types/ets/etsEnumType.h | 6 +- checker/types/ets/etsFunctionType.cpp | 8 +- checker/types/ets/etsFunctionType.h | 4 +- checker/types/ets/etsObjectType.cpp | 16 +- checker/types/ets/etsObjectType.h | 12 +- checker/types/ets/etsStringType.cpp | 2 +- checker/types/ets/etsStringType.h | 2 +- checker/types/ets/etsTypeParameter.h | 2 +- checker/types/ets/etsVoidType.h | 2 +- checker/types/ets/floatType.cpp | 4 +- checker/types/ets/floatType.h | 2 +- checker/types/ets/intType.cpp | 4 +- checker/types/ets/intType.h | 2 +- checker/types/ets/longType.cpp | 4 +- checker/types/ets/longType.h | 2 +- checker/types/ets/shortType.cpp | 4 +- checker/types/ets/shortType.h | 2 +- checker/types/ets/types.h | 2 +- checker/types/ets/wildcardType.h | 2 +- checker/types/globalTypesHolder.cpp | 62 ++--- checker/types/globalTypesHolder.h | 2 +- checker/types/signature.cpp | 8 +- checker/types/signature.h | 4 +- checker/types/ts/anyType.h | 2 +- checker/types/ts/arrayType.cpp | 4 +- checker/types/ts/arrayType.h | 2 +- checker/types/ts/bigintLiteralType.h | 2 +- checker/types/ts/bigintType.h | 2 +- checker/types/ts/booleanLiteralType.h | 2 +- checker/types/ts/booleanType.h | 2 +- checker/types/ts/constructorType.cpp | 2 +- checker/types/ts/elementFlags.h | 2 +- checker/types/ts/enumLiteralType.cpp | 4 +- checker/types/ts/enumLiteralType.h | 2 +- checker/types/ts/enumType.cpp | 2 +- checker/types/ts/enumType.h | 2 +- checker/types/ts/functionType.cpp | 2 +- checker/types/ts/indexInfo.h | 2 +- checker/types/ts/interfaceType.cpp | 6 +- checker/types/ts/neverType.h | 2 +- checker/types/ts/nonPrimitiveType.h | 2 +- checker/types/ts/nullType.h | 2 +- checker/types/ts/numberLiteralType.cpp | 6 +- checker/types/ts/numberLiteralType.h | 2 +- checker/types/ts/numberType.cpp | 4 +- checker/types/ts/numberType.h | 2 +- checker/types/ts/objectDescriptor.cpp | 6 +- checker/types/ts/objectDescriptor.h | 2 +- checker/types/ts/objectLiteralType.cpp | 6 +- checker/types/ts/objectType.cpp | 8 +- checker/types/ts/objectType.h | 10 +- checker/types/ts/stringLiteralType.h | 2 +- checker/types/ts/stringType.h | 2 +- checker/types/ts/tupleType.cpp | 2 +- checker/types/ts/tupleType.h | 6 +- checker/types/ts/typeParameter.h | 2 +- checker/types/ts/typeReference.h | 2 +- checker/types/ts/types.h | 2 +- checker/types/ts/undefinedType.h | 2 +- checker/types/ts/unionType.cpp | 2 +- checker/types/ts/unionType.h | 2 +- checker/types/ts/unknownType.h | 2 +- checker/types/ts/voidType.h | 2 +- checker/types/type.cpp | 6 +- checker/types/type.h | 6 +- checker/types/typeFacts.h | 2 +- checker/types/typeFlag.h | 2 +- checker/types/typeRelation.cpp | 6 +- checker/types/typeRelation.h | 8 +- compiler/base/catchTable.cpp | 2 +- compiler/base/catchTable.h | 4 +- compiler/base/condition.cpp | 8 +- compiler/base/condition.h | 2 +- compiler/base/destructuring.cpp | 22 +- compiler/base/destructuring.h | 2 +- compiler/base/hoisting.cpp | 6 +- compiler/base/iterators.cpp | 6 +- compiler/base/iterators.h | 2 +- compiler/base/lexenv.cpp | 10 +- compiler/base/lexenv.h | 4 +- compiler/base/literals.cpp | 8 +- compiler/base/literals.h | 4 +- compiler/base/lreference.cpp | 32 +-- compiler/base/lreference.h | 4 +- compiler/base/optionalChain.cpp | 2 +- compiler/base/optionalChain.h | 4 +- compiler/core/ETSGen.cpp | 52 ++-- compiler/core/ETSGen.h | 14 +- compiler/core/ETSemitter.cpp | 50 ++-- compiler/core/ETSfunction.cpp | 36 +-- compiler/core/ETSfunction.h | 2 +- compiler/core/JSemitter.cpp | 16 +- compiler/core/codeGen.cpp | 16 +- compiler/core/codeGen.h | 8 +- compiler/core/compileJob.cpp | 2 +- compiler/core/compileJob.h | 4 +- compiler/core/compileQueue.cpp | 12 +- compiler/core/compileQueue.h | 4 +- compiler/core/compilerContext.h | 4 +- compiler/core/compilerImpl.cpp | 48 ++-- compiler/core/compilerImpl.h | 4 +- compiler/core/dynamicContext.cpp | 28 +- compiler/core/dynamicContext.h | 8 +- compiler/core/emitter.cpp | 34 ++- compiler/core/emitter.h | 4 +- compiler/core/envScope.cpp | 6 +- compiler/core/envScope.h | 10 +- compiler/core/function.cpp | 24 +- compiler/core/function.h | 2 +- compiler/core/labelPair.h | 2 +- compiler/core/labelTarget.cpp | 2 +- compiler/core/labelTarget.h | 4 +- compiler/core/moduleContext.cpp | 16 +- compiler/core/moduleContext.h | 2 +- compiler/core/pandagen.cpp | 260 ++++++++++++++++-- compiler/core/pandagen.h | 18 +- compiler/core/programElement.h | 2 +- compiler/core/regAllocator.cpp | 4 +- compiler/core/regAllocator.h | 2 +- compiler/core/regScope.cpp | 14 +- compiler/core/regScope.h | 2 +- compiler/core/regSpiller.cpp | 4 +- compiler/core/regSpiller.h | 4 +- compiler/core/switchBuilder.h | 12 +- compiler/core/targetTypeContext.cpp | 2 +- compiler/function/asyncFunctionBuilder.cpp | 6 +- compiler/function/asyncFunctionBuilder.h | 4 +- .../asyncGeneratorFunctionBuilder.cpp | 6 +- .../function/asyncGeneratorFunctionBuilder.h | 4 +- compiler/function/functionBuilder.cpp | 12 +- compiler/function/functionBuilder.h | 2 +- .../function/generatorFunctionBuilder.cpp | 6 +- compiler/function/generatorFunctionBuilder.h | 4 +- compiler/lowering/ets/opAssignment.cpp | 32 +-- compiler/lowering/ets/opAssignment.h | 2 +- compiler/lowering/phase.cpp | 8 +- compiler/lowering/phase.h | 2 +- compiler/lowering/util.cpp | 2 +- compiler/lowering/util.h | 6 +- compiler/templates/formats.h.erb | 2 +- compiler/templates/isa.h.erb | 2 +- compiler/templates/signatures.h.erb | 4 +- es2panda.cpp | 2 +- ir/as/namedType.cpp | 8 +- ir/as/namedType.h | 2 +- ir/as/prefixAssertionExpression.cpp | 4 +- ir/as/prefixAssertionExpression.h | 2 +- ir/astDump.cpp | 4 +- ir/astDump.h | 10 +- ir/astNode.h | 6 +- ir/base/catchClause.cpp | 24 +- ir/base/catchClause.h | 4 +- ir/base/classDefinition.cpp | 46 ++-- ir/base/classDefinition.h | 10 +- ir/base/classElement.cpp | 4 +- ir/base/classElement.h | 2 +- ir/base/classProperty.cpp | 16 +- ir/base/classProperty.h | 2 +- ir/base/classStaticBlock.cpp | 18 +- ir/base/classStaticBlock.h | 2 +- ir/base/decorator.cpp | 4 +- ir/base/decorator.h | 2 +- ir/base/metaProperty.cpp | 6 +- ir/base/metaProperty.h | 2 +- ir/base/methodDefinition.cpp | 26 +- ir/base/methodDefinition.h | 2 +- ir/base/property.cpp | 16 +- ir/base/property.h | 4 +- ir/base/scriptFunction.cpp | 18 +- ir/base/scriptFunction.h | 8 +- ir/base/spreadElement.cpp | 10 +- ir/base/spreadElement.h | 4 +- ir/base/templateElement.cpp | 6 +- ir/base/templateElement.h | 4 +- ir/base/tsIndexSignature.cpp | 8 +- ir/base/tsIndexSignature.h | 2 +- ir/base/tsMethodSignature.cpp | 12 +- ir/base/tsMethodSignature.h | 2 +- ir/base/tsPropertySignature.cpp | 6 +- ir/base/tsPropertySignature.h | 2 +- ir/base/tsSignatureDeclaration.cpp | 12 +- ir/base/tsSignatureDeclaration.h | 2 +- ir/ets/etsClassLiteral.cpp | 10 +- ir/ets/etsClassLiteral.h | 2 +- ir/ets/etsFunctionType.cpp | 28 +- ir/ets/etsFunctionType.h | 2 +- ir/ets/etsImportDeclaration.h | 8 +- ir/ets/etsImportSource.h | 8 +- ir/ets/etsLaunchExpression.cpp | 16 +- ir/ets/etsLaunchExpression.h | 2 +- ir/ets/etsNewArrayInstanceExpression.cpp | 8 +- ir/ets/etsNewArrayInstanceExpression.h | 2 +- ir/ets/etsNewClassInstanceExpression.cpp | 24 +- ir/ets/etsNewClassInstanceExpression.h | 4 +- .../etsNewMultiDimArrayInstanceExpression.cpp | 12 +- .../etsNewMultiDimArrayInstanceExpression.h | 2 +- ir/ets/etsPackageDeclaration.cpp | 6 +- ir/ets/etsPackageDeclaration.h | 2 +- ir/ets/etsParameterExpression.cpp | 14 +- ir/ets/etsParameterExpression.h | 2 +- ir/ets/etsPrimitiveType.cpp | 8 +- ir/ets/etsPrimitiveType.h | 2 +- ir/ets/etsScript.h | 2 +- ir/ets/etsStructDeclaration.cpp | 14 +- ir/ets/etsStructDeclaration.h | 2 +- ir/ets/etsTypeReference.cpp | 10 +- ir/ets/etsTypeReference.h | 2 +- ir/ets/etsTypeReferencePart.cpp | 14 +- ir/ets/etsTypeReferencePart.h | 2 +- ir/ets/etsWildcardType.cpp | 10 +- ir/ets/etsWildcardType.h | 2 +- ir/expression.h | 2 +- ir/expressions/arrayExpression.cpp | 30 +- ir/expressions/arrayExpression.h | 4 +- ir/expressions/arrowFunctionExpression.cpp | 20 +- ir/expressions/arrowFunctionExpression.h | 2 +- ir/expressions/assignmentExpression.cpp | 30 +- ir/expressions/assignmentExpression.h | 4 +- ir/expressions/awaitExpression.cpp | 18 +- ir/expressions/awaitExpression.h | 2 +- ir/expressions/binaryExpression.cpp | 20 +- ir/expressions/binaryExpression.h | 4 +- ir/expressions/callExpression.cpp | 42 +-- ir/expressions/callExpression.h | 4 +- ir/expressions/chainExpression.cpp | 12 +- ir/expressions/chainExpression.h | 4 +- ir/expressions/classExpression.cpp | 4 +- ir/expressions/classExpression.h | 2 +- ir/expressions/conditionalExpression.cpp | 10 +- ir/expressions/conditionalExpression.h | 2 +- ir/expressions/directEvalExpression.cpp | 6 +- ir/expressions/directEvalExpression.h | 2 +- ir/expressions/functionExpression.cpp | 14 +- ir/expressions/functionExpression.h | 2 +- ir/expressions/identifier.cpp | 18 +- ir/expressions/identifier.h | 6 +- ir/expressions/importExpression.cpp | 4 +- ir/expressions/importExpression.h | 2 +- ir/expressions/literal.h | 2 +- ir/expressions/literals/bigIntLiteral.cpp | 6 +- ir/expressions/literals/bigIntLiteral.h | 4 +- ir/expressions/literals/booleanLiteral.cpp | 10 +- ir/expressions/literals/booleanLiteral.h | 2 +- ir/expressions/literals/charLiteral.cpp | 8 +- ir/expressions/literals/charLiteral.h | 4 +- ir/expressions/literals/nullLiteral.cpp | 10 +- ir/expressions/literals/nullLiteral.h | 2 +- ir/expressions/literals/numberLiteral.cpp | 12 +- ir/expressions/literals/numberLiteral.h | 6 +- ir/expressions/literals/regExpLiteral.cpp | 10 +- ir/expressions/literals/regExpLiteral.h | 6 +- ir/expressions/literals/stringLiteral.cpp | 10 +- ir/expressions/literals/stringLiteral.h | 4 +- ir/expressions/memberExpression.cpp | 30 +- ir/expressions/memberExpression.h | 6 +- ir/expressions/newExpression.cpp | 12 +- ir/expressions/newExpression.h | 2 +- ir/expressions/objectExpression.cpp | 54 ++-- ir/expressions/objectExpression.h | 6 +- ir/expressions/omittedExpression.cpp | 4 +- ir/expressions/omittedExpression.h | 2 +- ir/expressions/sequenceExpression.cpp | 4 +- ir/expressions/sequenceExpression.h | 2 +- ir/expressions/superExpression.cpp | 12 +- ir/expressions/superExpression.h | 2 +- ir/expressions/taggedTemplateExpression.cpp | 18 +- ir/expressions/taggedTemplateExpression.h | 2 +- ir/expressions/templateLiteral.cpp | 12 +- ir/expressions/templateLiteral.h | 4 +- ir/expressions/thisExpression.cpp | 24 +- ir/expressions/thisExpression.h | 2 +- ir/expressions/unaryExpression.cpp | 20 +- ir/expressions/unaryExpression.h | 4 +- ir/expressions/updateExpression.cpp | 22 +- ir/expressions/updateExpression.h | 4 +- ir/expressions/yieldExpression.cpp | 8 +- ir/expressions/yieldExpression.h | 2 +- ir/irnode.h | 10 +- ir/module/exportAllDeclaration.cpp | 6 +- ir/module/exportAllDeclaration.h | 2 +- ir/module/exportDefaultDeclaration.cpp | 4 +- ir/module/exportDefaultDeclaration.h | 2 +- ir/module/exportNamedDeclaration.cpp | 12 +- ir/module/exportNamedDeclaration.h | 2 +- ir/module/exportSpecifier.cpp | 4 +- ir/module/exportSpecifier.h | 2 +- ir/module/importDeclaration.cpp | 10 +- ir/module/importDeclaration.h | 4 +- ir/module/importDefaultSpecifier.cpp | 10 +- ir/module/importDefaultSpecifier.h | 2 +- ir/module/importNamespaceSpecifier.cpp | 12 +- ir/module/importNamespaceSpecifier.h | 2 +- ir/module/importSpecifier.cpp | 10 +- ir/module/importSpecifier.h | 2 +- ir/opaqueTypeNode.cpp | 2 +- ir/opaqueTypeNode.h | 2 +- ir/statement.h | 2 +- ir/statements/assertStatement.cpp | 16 +- ir/statements/assertStatement.h | 2 +- ir/statements/blockStatement.cpp | 12 +- ir/statements/blockStatement.h | 2 +- ir/statements/breakStatement.cpp | 10 +- ir/statements/breakStatement.h | 2 +- ir/statements/classDeclaration.cpp | 14 +- ir/statements/classDeclaration.h | 2 +- ir/statements/continueStatement.cpp | 8 +- ir/statements/continueStatement.h | 4 +- ir/statements/debuggerStatement.cpp | 2 +- ir/statements/debuggerStatement.h | 2 +- ir/statements/doWhileStatement.cpp | 16 +- ir/statements/doWhileStatement.h | 2 +- ir/statements/emptyStatement.cpp | 2 +- ir/statements/emptyStatement.h | 2 +- ir/statements/expressionStatement.cpp | 4 +- ir/statements/expressionStatement.h | 2 +- ir/statements/forInStatement.cpp | 16 +- ir/statements/forInStatement.h | 2 +- ir/statements/forOfStatement.cpp | 24 +- ir/statements/forOfStatement.h | 2 +- ir/statements/forUpdateStatement.cpp | 20 +- ir/statements/forUpdateStatement.h | 2 +- ir/statements/functionDeclaration.cpp | 24 +- ir/statements/functionDeclaration.h | 2 +- ir/statements/ifStatement.cpp | 12 +- ir/statements/ifStatement.h | 2 +- ir/statements/labelledStatement.cpp | 10 +- ir/statements/labelledStatement.h | 4 +- ir/statements/loopStatement.cpp | 2 +- ir/statements/loopStatement.h | 4 +- ir/statements/returnStatement.cpp | 26 +- ir/statements/returnStatement.h | 2 +- ir/statements/switchCaseStatement.cpp | 4 +- ir/statements/switchCaseStatement.h | 2 +- ir/statements/switchStatement.cpp | 24 +- ir/statements/switchStatement.h | 4 +- ir/statements/throwStatement.cpp | 8 +- ir/statements/throwStatement.h | 2 +- ir/statements/tryStatement.cpp | 14 +- ir/statements/tryStatement.h | 4 +- ir/statements/variableDeclaration.cpp | 20 +- ir/statements/variableDeclaration.h | 2 +- ir/statements/variableDeclarator.cpp | 32 +-- ir/statements/variableDeclarator.h | 4 +- ir/statements/whileStatement.cpp | 18 +- ir/statements/whileStatement.h | 2 +- ir/ts/tsAnyKeyword.cpp | 4 +- ir/ts/tsAnyKeyword.h | 2 +- ir/ts/tsArrayType.cpp | 6 +- ir/ts/tsArrayType.h | 2 +- ir/ts/tsAsExpression.cpp | 22 +- ir/ts/tsAsExpression.h | 4 +- ir/ts/tsBigintKeyword.cpp | 4 +- ir/ts/tsBigintKeyword.h | 2 +- ir/ts/tsBooleanKeyword.cpp | 4 +- ir/ts/tsBooleanKeyword.h | 2 +- ir/ts/tsClassImplements.cpp | 6 +- ir/ts/tsClassImplements.h | 2 +- ir/ts/tsConditionalType.cpp | 2 +- ir/ts/tsConditionalType.h | 2 +- ir/ts/tsConstructorType.cpp | 12 +- ir/ts/tsConstructorType.h | 2 +- ir/ts/tsEnumDeclaration.cpp | 32 +-- ir/ts/tsEnumDeclaration.h | 6 +- ir/ts/tsEnumMember.cpp | 6 +- ir/ts/tsEnumMember.h | 2 +- ir/ts/tsExternalModuleReference.cpp | 2 +- ir/ts/tsExternalModuleReference.h | 2 +- ir/ts/tsFunctionType.cpp | 18 +- ir/ts/tsFunctionType.h | 2 +- ir/ts/tsImportEqualsDeclaration.cpp | 6 +- ir/ts/tsImportEqualsDeclaration.h | 2 +- ir/ts/tsImportType.cpp | 6 +- ir/ts/tsImportType.h | 2 +- ir/ts/tsIndexedAccessType.cpp | 4 +- ir/ts/tsIndexedAccessType.h | 2 +- ir/ts/tsInferType.cpp | 4 +- ir/ts/tsInferType.h | 2 +- ir/ts/tsInterfaceBody.cpp | 2 +- ir/ts/tsInterfaceBody.h | 2 +- ir/ts/tsInterfaceDeclaration.cpp | 24 +- ir/ts/tsInterfaceDeclaration.h | 6 +- ir/ts/tsInterfaceHeritage.cpp | 12 +- ir/ts/tsInterfaceHeritage.h | 2 +- ir/ts/tsIntersectionType.cpp | 4 +- ir/ts/tsIntersectionType.h | 2 +- ir/ts/tsLiteralType.cpp | 4 +- ir/ts/tsLiteralType.h | 2 +- ir/ts/tsMappedType.cpp | 6 +- ir/ts/tsMappedType.h | 4 +- ir/ts/tsModuleBlock.cpp | 4 +- ir/ts/tsModuleBlock.h | 4 +- ir/ts/tsModuleDeclaration.cpp | 8 +- ir/ts/tsModuleDeclaration.h | 4 +- ir/ts/tsNamedTupleMember.cpp | 2 +- ir/ts/tsNamedTupleMember.h | 2 +- ir/ts/tsNeverKeyword.cpp | 4 +- ir/ts/tsNeverKeyword.h | 2 +- ir/ts/tsNonNullExpression.cpp | 6 +- ir/ts/tsNonNullExpression.h | 2 +- ir/ts/tsNullKeyword.cpp | 4 +- ir/ts/tsNullKeyword.h | 2 +- ir/ts/tsNumberKeyword.cpp | 4 +- ir/ts/tsNumberKeyword.h | 2 +- ir/ts/tsObjectKeyword.cpp | 4 +- ir/ts/tsObjectKeyword.h | 2 +- ir/ts/tsParameterProperty.cpp | 4 +- ir/ts/tsParameterProperty.h | 4 +- ir/ts/tsParenthesizedType.cpp | 4 +- ir/ts/tsParenthesizedType.h | 2 +- ir/ts/tsQualifiedName.cpp | 8 +- ir/ts/tsQualifiedName.h | 2 +- ir/ts/tsStringKeyword.cpp | 4 +- ir/ts/tsStringKeyword.h | 2 +- ir/ts/tsThisType.cpp | 2 +- ir/ts/tsThisType.h | 2 +- ir/ts/tsTupleType.cpp | 14 +- ir/ts/tsTupleType.h | 2 +- ir/ts/tsTypeAliasDeclaration.cpp | 16 +- ir/ts/tsTypeAliasDeclaration.h | 2 +- ir/ts/tsTypeAssertion.cpp | 4 +- ir/ts/tsTypeAssertion.h | 2 +- ir/ts/tsTypeLiteral.cpp | 10 +- ir/ts/tsTypeLiteral.h | 2 +- ir/ts/tsTypeOperator.cpp | 2 +- ir/ts/tsTypeOperator.h | 2 +- ir/ts/tsTypeParameter.cpp | 6 +- ir/ts/tsTypeParameter.h | 2 +- ir/ts/tsTypeParameterDeclaration.cpp | 6 +- ir/ts/tsTypeParameterDeclaration.h | 4 +- ir/ts/tsTypeParameterInstantiation.cpp | 6 +- ir/ts/tsTypeParameterInstantiation.h | 2 +- ir/ts/tsTypePredicate.cpp | 6 +- ir/ts/tsTypePredicate.h | 2 +- ir/ts/tsTypeQuery.cpp | 4 +- ir/ts/tsTypeQuery.h | 2 +- ir/ts/tsTypeReference.cpp | 22 +- ir/ts/tsTypeReference.h | 2 +- ir/ts/tsUndefinedKeyword.cpp | 4 +- ir/ts/tsUndefinedKeyword.h | 2 +- ir/ts/tsUnionType.cpp | 4 +- ir/ts/tsUnionType.h | 2 +- ir/ts/tsUnknownKeyword.cpp | 4 +- ir/ts/tsUnknownKeyword.h | 2 +- ir/ts/tsVoidKeyword.cpp | 4 +- ir/ts/tsVoidKeyword.h | 2 +- ir/typeNode.h | 2 +- ir/validationInfo.h | 4 +- lexer/ASLexer.h | 2 +- lexer/ETSLexer.h | 2 +- lexer/TSLexer.h | 2 +- lexer/keywordString.h | 4 +- lexer/keywords.cpp | 4 +- lexer/keywordsBase.h | 4 +- lexer/keywordsUtil.cpp | 4 +- lexer/keywordsUtil.h | 10 +- lexer/lexer.cpp | 10 +- lexer/lexer.h | 8 +- lexer/regexp/regexp.cpp | 2 +- lexer/regexp/regexp.h | 4 +- lexer/templates/keywords.h.erb | 2 +- lexer/token/number.cpp | 2 +- lexer/token/number.h | 4 +- lexer/token/sourceLocation.cpp | 2 +- lexer/token/sourceLocation.h | 2 +- lexer/token/token.h | 10 +- parser/ASparser.cpp | 118 ++++---- parser/ETSparser.cpp | 194 ++++++------- parser/ETSparser.h | 4 +- parser/TSparser.cpp | 196 ++++++------- parser/TypedParser.cpp | 80 +++--- parser/context/classPrivateContext.cpp | 8 +- parser/context/classPrivateContext.h | 4 +- parser/context/parserContext.cpp | 2 +- parser/context/parserContext.h | 6 +- parser/expressionParser.cpp | 108 ++++---- parser/parserFlags.h | 2 +- parser/parserImpl.cpp | 74 ++--- parser/parserImpl.h | 22 +- parser/program/program.cpp | 10 +- parser/program/program.h | 6 +- parser/statementParser.cpp | 104 +++---- test/CMakeLists.txt | 8 +- test/tsconfig/CMakeLists.txt | 2 +- test/tsconfig/test.sh | 3 +- util/arktsconfig.cpp | 2 +- util/arktsconfig.h | 2 +- util/declgenEts2Ts.cpp | 30 +- util/declgenEts2Ts.h | 4 +- util/helpers.cpp | 54 ++-- util/helpers.h | 6 +- 579 files changed, 3046 insertions(+), 2804 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 821a7f6f..290cac9e 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 f83342c8..584d01b7 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 41081aa9..0d453aac 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 2b4de63a..2e02b1a3 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 31575ae2..c5a15797 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 0fd7be7e..c7e07c69 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 ac6c8b22..edb51793 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 9628a5e7..e4ba26aa 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 38ceaf5d..2696a8a6 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 af3178f4..0768f3bc 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 30b11582..da79cc8b 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 57352cf0..0c81a161 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 aac7c7b0..254732d0 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 322146e9..2c0650c5 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 c59d4869..fdeb9556 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 b9c54af2..86f26b8c 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 a3c5da93..9182118c 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 e9352f05..15a87619 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 a39f41cb..71590bdf 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 5e00b2ec..59cf5ef1 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 14018e8d..22f53e1d 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 58791e1c..57a16b50 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 41d34031..eb845ee6 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 2a5d713f..ea807ca3 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 17a71109..43605ba9 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 00dc73fb..49e8603c 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 ffb07d9e..e0132644 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 d5dcaea2..9d6d36a6 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 3c826f67..d04615ca 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 191e17fa..998d03fb 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 b591fcb2..6e2bd624 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 6b1eefe7..604737be 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 ead1bf27..f4b2d6c8 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 101b6c0e..e3819833 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 5233e88b..81e0b2b3 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 6ddc33e2..7d9536bd 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 dd28a193..cae163ce 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 2a0b51da..07e4d134 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 79bfde80..948b0472 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 428ea3de..0061adab 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 10261b69..cd5e720a 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 da7926e5..fb05670f 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 b53dbb94..bcee5fc3 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 d5fc3b34..f6551200 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 3b076bc2..ecd0dd00 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 a0d88804..527ff8a2 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 7163a18d..4804f788 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 67324523..af4fb8bf 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 82738a3f..7dfc0a25 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 cf09ba10..749ae53a 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 94eff9f9..06270c4e 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 461380b6..5302988b 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 31352595..baadfa9f 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 a2096098..05b31340 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 3293e702..442a556b 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 675930d1..1bfcd41e 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 6f90280a..2c750ae2 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 157e18ce..3119eb7d 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 30b99566..8ba09ba6 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 1df627ac..8c8db5d9 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 68d37f28..3ab5b7bf 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 8832ab75..da5c365a 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 0bfe71d4..1121deb8 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 42dc9bdf..e37138b4 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 51c2a3f1..2dfb9192 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 f6d45b6d..88d52d8d 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 b29a2479..73d5040c 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 95fdf2a9..41ab10bc 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 a01d5432..c8f40f77 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 7fd48c08..06121bdc 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 a11e6b64..e7fc27ef 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 6042481e..3fab23a7 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 98aec8d8..9ffddd75 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 55044159..5c054551 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 dd107b12..ecbf47d8 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 2a523aff..aba253d3 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 4e7cf18c..6f7dc11b 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 4464e715..99e3d5e0 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 61731f3d..07365fa6 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 fcf73776..06e49c1b 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 84a789a0..323f3df4 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 bba8b07d..b0e5545e 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 b1cd7ff8..bff8035c 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 40723f39..52dbbfda 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 6781ee49..f842f762 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 1b8cfe64..06d452b7 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 1e8db6f4..7b252e8a 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 570846fc..b13e4392 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 04f142c4..ff1b65cc 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 4613be52..0c2f3a43 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 60061973..b87aa27c 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 f5aceec4..5e588ff6 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 4285b20b..af7582ca 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 ea7cff4b..d23996a8 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 05334150..bd7be067 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 483e51e5..4a516db4 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 49b30cd0..da85393c 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 8816e073..1d684863 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 129ac433..d40efa8f 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 f8d2a384..513c9b32 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 7c87a815..44c74500 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 2326b097..df8f6af9 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 f26e8d60..4246b89c 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 e0844ff4..27a2deca 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 7c5a0126..8cd1be72 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 9f31660c..287c0424 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 6589ec3b..0d2918bd 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 31993608..910c8bfa 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 8c389112..3554c9bf 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 9f9e027c..ef4c97bc 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 a63d6269..5681bb9a 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 82e0bcc0..ab0d4ef9 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 61ad2132..1135634b 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 05bc4972..7aa4b9ea 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 a7b09385..813d9e33 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 869de6e9..bdae6081 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 72ec7ae9..31d10478 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 e00e81b2..01fbd8bd 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 5f435e30..b6d8d747 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 75084929..4fd6dbbc 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 d3a73c35..fee3d68f 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 574b8330..f89b9745 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 e0cfacc9..596f79fc 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 6955580f..dabd5567 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 74262d77..60aadce2 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 99b266ab..00aada45 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 10007c0f..772b71cb 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 2c900f41..78dfefa0 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 26d9c709..696d7929 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 e6daf9ca..c771cf1d 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 eb74e36c..e767a141 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 48fa7564..a396052d 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 a7bd012c..309c9737 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 4014c65b..f49a0067 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 038061eb..aa217be9 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 e7938ecf..c47da6be 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 ecf89a6e..c1ebc389 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 1ed3abc5..20f4cadf 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 94c05255..a5cea0d8 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 229d2e97..b7d76ae4 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 645b426f..462d51a9 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 c811a1a1..70e30430 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 2d395ee4..594228dd 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 bdda3e4f..7d0183d6 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 5828c4ce..3df3155d 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 713b72eb..89b64102 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 404ed5af..897a20e6 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 4ad8ec21..f23785db 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 96ef28af..b2010553 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 7b235e3e..0b519d58 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 538fa1b7..e3e263a1 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 2b9bfcc7..8d963106 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 de10b2f2..35d135fc 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 e69eb649..2c6d11a7 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 e5fe539a..918f5228 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 8f9b434e..720304a1 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 94cfa060..6dda8adc 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 93be8112..6abd143d 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 ae2b7d47..a19942d5 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 64620635..9bd2c5d5 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 06da86f2..7ebaf192 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 296fd82d..85071b3a 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 216d9f80..fbea1499 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 29d4cb36..6a0662e8 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 d463bc1e..3d555fdb 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 c6c34c7d..a3e78d43 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 5580eecd..e63183ad 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 7806cde9..29f7582b 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 a4143470..325ff647 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 8a0ccd76..bc665587 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 a1e30e6c..ec799f0b 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 e7c10eab..0f09dcd1 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 7376fd54..08332779 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 aa85b6c5..441985b5 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 6029493a..b48c9b47 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 101b0811..c6c4dc75 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 8b1cce97..b8ce6276 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 41d4d41a..5577080e 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 e12ae17a..564756e3 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 09485acf..07a66058 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 3f28fe07..f050cc9c 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 44d7cccf..236ef492 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 b7e1a002..23dd9a0e 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 c71eadb0..d9a3b77a 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 9ed8c511..db50df86 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 8111ec2c..0804be0a 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 237ef90e..4544c756 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 4fce74d0..93cdfa97 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 47dc873d..de5fa34d 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 56d06700..cee0090c 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 f08786eb..f153acb2 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 476c9929..5ea987cb 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 7d77ab5a..0891cfe7 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 b05d9a14..9f86ca2b 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 1db2b27a..3147472b 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 19eecbb3..a5b53e72 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 3d290dd1..d84c0a42 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 23697494..e1539b2e 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 5a585187..1ee0ad6a 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 46cd518c..68b43514 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 fdc08493..96813f07 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 3ecfe4a3..c4522f64 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 f7ebe81e..6e736447 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 12ab5296..699ebc6d 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 37e7adaf..df046706 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 608b2c35..0fc4d3bb 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 cd667c94..5b7c4514 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 569b031c..9c7f8e46 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 67f74a42..96ff2ec5 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 670af876..deceb3d8 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 78d7a66f..a2656e5e 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 b5f8fe87..1c2554b8 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 5d5614dc..aa1238c1 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 e8c6f030..55b53f9e 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 2faf0c8b..3627b995 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 68b1fc63..30ce7fde 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 980121c0..5ca62944 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 b54af905..a2e6ca58 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 4cb96893..95a8ae55 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 9a69fadc..9bde475c 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 6205871d..a7577781 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 a362627c..429266a6 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 436657b8..77515655 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 dff68f56..a40be1fd 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 3b5d1c78..a2a6cd89 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 39a24077..9f95bd56 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 7aa66bbc..38bcd67f 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 2d8353e1..8c83e7b4 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 0b8386c2..bf42965e 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 5a9dbbc8..922ceac2 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 25290e57..a36d4344 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 b705fe7a..458f00dd 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 167f58e8..ddf8741b 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 91f53dce..f36b79b4 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 a2921c97..f5a0a0c3 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 5994af28..12b933d8 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 e87d7497..dcb19eea 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 e996e14b..4b67f6d9 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 1013be97..496f9f85 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 ba65a722..de117c4f 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 df0e1983..b21e4733 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 6eab2639..a241ee79 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 d0f46864..408852b2 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 062bd784..42e336ac 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 87d83e55..836083e6 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 1e403344..af8d0a0c 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 829788f6..3cabe810 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 4f654a30..ec647696 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 1017fe1a..5de34410 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 485abe8f..8e3f9ef8 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 b955006f..ce59154e 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 0976a0e6..c24c0a6f 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 a99d9df8..5054fd7f 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 d6074d82..7e15b36f 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 50697164..cc2b6278 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 ee0824cb..3fe13bae 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 fb86d527..d7f93c05 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 1c555e8a..fed743ed 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 b5a9a23b..1ac521ce 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 7aaaaa14..1054ba84 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 a326158a..5ac5fbc8 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 c7241987..85e6e288 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 ac4326c2..0762e81f 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 e6482ae0..09598d5b 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 37da5627..db29746c 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 b37898d6..217c726b 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 707a06e5..573cb672 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 1308be5b..3cfddf1f 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 fe38292f..b39ebfdd 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 bdd714bf..e121ff54 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 ad8fb30a..a83caebc 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 61bd8936..62770920 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 3caf16d8..aa033e3b 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 c99ab4dd..76ac886f 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 16a2a1b4..b0b0e646 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 be1531e5..9cd2390c 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 70c3654b..f9afb603 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 cce74e4e..49e3ff12 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 a0ad5913..245fb970 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 d3fb7f72..5e04482c 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 4d2e8638..7d29085a 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 4d8d18df..60d66c48 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 0dc0721e..73936868 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 e3ed4705..d04ddd35 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 0706500a..1cf38efa 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 8ef739b8..cda0cbfb 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 90939394..0a1b6a3e 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 0b049634..7e2c510a 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 f84f6b4f..ff1215b7 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 8ec1fd88..820b6fb5 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 3e6586c1..c8ae085f 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 77740427..2f0f35a9 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 e0fdc5bf..62f8b74c 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 21340ea1..7a52e9b8 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 a2b8bd6b..849f5234 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 ced1b144..17b8ef6c 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 5896d457..4d86e090 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 004aa492..f8d82bcf 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 755e31d1..07db87b9 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 c65d3375..4ce8ce2a 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 a34c7c0a..c83f4196 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 9fc32deb..3fc517a4 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 94da9053..dd20dde0 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 3c0ec1fe..efe0e8f9 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 db22077b..5bcefdb8 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 af8ec68d..55dddea5 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 1676b304..f3a90f22 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 fc66c969..f94109b4 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 92e0a9ad..25f84904 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 c96b56b3..90ac4517 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 05243c3a..d382279d 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 c65a6deb..3537218a 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 323cc8d1..0628232a 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 1b453fb1..7a6eeb4e 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 7fe1a059..f1690d09 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 0dd6f2f6..ecefc3a8 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 4a368226..1ab8e4a0 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 0504f361..245e6845 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 52d3dadb..e18aad50 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 039a4de0..356301fb 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 85fb38c5..0e62ab53 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 aff15d3f..6800ae40 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 ca8a7933..4b219185 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 d3ddf590..fd9d7fed 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 9f7a1305..212db72e 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 4dce7d51..3f445797 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 17773954..0fd5bdc7 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 c9f4437b..90c816d2 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 abbf12ef..5d5057d7 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 a0cf5118..bed945f6 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 e8634496..7d730880 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 3a270c77..7618f074 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 45ba935d..d9948977 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 4bc24a0a..f46b8285 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 5d0dd660..dba69d29 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 b42f25a2..cce639f0 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 f9befce0..e9f35b27 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 ac01f2d5..abe228d2 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 790f6902..90d9cacd 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 c2dd8c60..d5e50c55 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 edc66493..0a8bbaeb 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 d4ec0b38..593108b1 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 721ed506..4fbd4414 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 5de92634..cb044f95 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 2d89a1b7..6795ae44 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 38d3f659..46d7e08f 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 1c2f8568..2dadceaa 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 d3aa4d5c..16d2566a 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 56a99b9c..20da8871 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 f4e812f5..82dddab3 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 e86b4173..34be758d 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 36cd77d3..1009f468 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 c5c9a2ed..4915f561 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 a2e8a0ef..ca9976d3 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 40b5b0fa..dfa24a9d 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 9daf0e56..69f85a76 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 35332dc2..1fb16fce 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 784f40f4..e8091c7d 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 808aa42c..af908299 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 3172afa0..12ac0492 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 9a43b7c4..082482be 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 8760d9dc..611fc7f1 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 9b141ee6..52a4ab4c 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 aaeb23f6..27ec06ea 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 64b24b3b..0d4d22fe 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 d500b094..701249e5 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 6e9fe355..a9ff567e 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 69a847e3..a66ed1a2 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 8355de20..afcdea02 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 0daa7b8c..65717900 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 029ed5b2..38af658d 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 a2101f45..62acbf6f 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 6d7f9f2a..e7949319 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 d9597d8b..e308dd2b 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 2f16d30f..f6bfefbd 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 f5e4250c..b946fbd1 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 3fe9573e..18594b35 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 7606a32c..2413efb8 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 62dd49b1..7d39425a 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 7c9487e8..45d2706c 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 dff9e0fc..0af20262 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 2f1c5f62..34361434 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 bcd0303d..9a0c1311 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 2de25ec6..ed97769f 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 a9616ff2..326b72b4 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 40d32c1f..294752a1 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 48ca3340..01181345 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 2693a7d9..ec70fe0c 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 37a21272..69a50289 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 d24ad385..4e02c229 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 8df215ba..43ab14c9 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 a819bf06..e9273960 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 7a3c604c..6c0822d5 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 aba496d2..c2e535c0 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 5327db5f..47cc3d6e 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 b07ec135..2eead3db 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 81aff41e..506daf50 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 0317e135..d9858dbf 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 d3abf388..d7a87542 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 99cf5786..58cf43cf 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 c4b94136..5da09fdd 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 466999a2..44c82b2f 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 ff9d5ee6..61ebaca0 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 3bbbeadc..2f80d872 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 09d0e7eb..2a3a56cc 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 0b4bd06b..c8e99fb4 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 9e5b7e48..a12a9810 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 6d21105c..9bb2ecf8 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 2ac1f910..d297b0a5 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 1dc27f30..d6a1c001 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 43c4da0e..5eb8b274 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 9f4b326f..0c00928b 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 2f613ed5..b931fe18 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 855d9af8..b2596d77 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 8c8ca024..be77a04f 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 d6cd8fef..7a5779bd 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 af14822f..4b547874 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 9b0986a1..1bd9e38a 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 d7a4b66d..fd6286ae 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 d896fea9..44c9adde 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 23c8447a..d5135069 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 af45ccd2..0ed32b85 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 ec51c479..c5d3df85 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 f7f31197..847f426d 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 db45c701..ab088aaa 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 f348ce1c..dff234ec 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 ca8d7380..8133ee83 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 4acb218d..74b955c8 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 cde204ee..79ced21c 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 4578eddd..60117036 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 85e76c41..7c2cf8a0 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 cf67cb31..1b1234ff 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 0a1fbad5..ebfaa2a8 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 e1d3f263..7ecf3c14 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 352384fa..170d086c 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 237c8ba0..5719a54c 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 a7845b3c..725b9118 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 c022b83b..add9c0e3 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 7832bc88..cdbb98ff 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 bbfd092c..54985183 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 7473da3c..0d50b96a 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 7694d00d..61fe591e 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 099f0862..f5759ccf 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 d75ee260..a4936f1c 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 a4d61ec3..00ad11e2 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 fc2867e5..82b5510f 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 696f45dc..175de065 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 e352f6d5..d2a26839 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 9b4ed634..becd2bbb 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 ad40a08e..2d84aebc 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 8695d8f4..5a9ffff6 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 94c0bb06..7661f213 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 d540bf9e..d0cb459a 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 30e13d77..52918aee 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 4d611529..5e9aa155 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 963cd773..2ab4685a 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 f0903f33..9bee18d5 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 e3d369fc..8f8d3f16 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 17544aa0..eb615a79 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 2c66baa1..cc2d7dea 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 fafa42ce..6cdc3ba6 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 ddb19692..2813e2a8 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 cac2c323..6c4f97c5 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 27efc789..1d456ed9 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 7acc6c97..5c06f161 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 cfbae58a..5d62c977 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 69a72a2b..369391df 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 d5fdb782..7197e7c2 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 b44cd6e1..f6060046 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 9715935f..be5c2d25 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 128790c1..19e92cbd 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 9055cbc2..3ce89c33 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 f0ed34c1..4acbc734 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 68610c3d..7ed628fa 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 bdfa1039..08db35d3 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 02412802..9569ef38 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 f387f473..bc7946d3 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 d16d934b..c2fe6781 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 436ea67d..4715d9bf 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 79da16df..66c99a26 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 264e1eef..beb7f336 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 eebffb1f..e29019df 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 a0b38f81..e92c5787 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 5b64d849..a7266a6a 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 a4dc8bb2..92b64c3d 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 9b18b966..20053e4a 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 4a5a1fb8..4bbd98a6 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 1f49e834..22910a22 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 e866c134..49f02916 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 eb2c6a5f..a443f194 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 63d4e243..294e15b5 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 d18e2747..f9012741 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 423187ec..eb471e9d 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 dc2d0dbe..d06a36dd 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 6d7c13c9..d42b520c 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 631ef4c0..77b8fbb8 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 620da65d..ba224d1c 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 4d12d821..8175be39 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 8c6d4fe5..0c1d5d43 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 9bbb9349..d8698555 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 4a4ca8b2..3374b8bb 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 80e54ff6..14b8cf39 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 8f2eaa24..445cf9b4 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 cf98a1f5..0cbf2359 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 b7d32316..6eebdc76 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 b94744a9..53a70353 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 7c0b4b16..d08e3640 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 9b090ba5..f38a2cb5 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 9a48d29a..7abafef5 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 ec0ac49c..e8a66171 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 6cdce5e2..17838b7a 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 b7309789..9f0cb0a1 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 0ca45370..538bb29e 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 2475bc2b..ea2b54e7 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 45e1ceef..3a92543a 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 94e310e7..aaf9227a 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 204a9fa3..4039d1f1 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 db00349a..d5c5b926 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 3011d018..ad6fbf20 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 9b9eeb39..8bc132d4 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 d72dfa4b..c2896cd3 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 201b320f..e32610b7 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 4aa888c1..31752510 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 8be4b9e1..c4442a59 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 abbd59cb..a1ccefd3 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 e9e776d3..29c745bb 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 dddf96ad..6d889996 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 622e09ab..1dcc42d7 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 97957e4f..c833b7f5 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 ec585bd7..65343e59 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 80391df9..3799e4b6 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 94e60352..0e912ca1 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 0bbe953d..43417ff9 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 49598505..6a1d20d3 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 e36d0d4e..e7b1f3b9 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 75b5e9cf..d8a844fa 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 028a5c5a..de0e800c 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 af513f88..d5f5fd6b 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 98830e7b..2c729f2a 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 88892ed6..93eb4c30 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 b941cbdc..64473201 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 7a51b40c..f601167e 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 b0227c28..1f601357 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 8ac2cf29..055d14c2 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 69cf56f5..ab7f4474 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 589da664..96d5d5ec 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 d24a70a5..1febe120 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 bba60408..f2e02693 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 ee9fb7f8..67c37fed 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 6a89ada2..bb909d1c 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 965e08c7..4ea4a7f5 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 e7164e95..109e4fd5 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 0b7634d5..eea31557 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 fa39b88d..860e5cbf 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 4dc01b61..dc50f020 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 1aba9641..2cee81ad 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 4a3d972c..38de7b09 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 08f4c74d..8a36b79c 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 667cac76..240509d8 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 b07c463e..83221107 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 70533326..6780524b 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 ab434849..61be343a 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 efae06d4..73f79c27 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 fe97a808..7849e38a 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 cab419b8..792114ad 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 2968cca6..1af0e9ee 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 2276f7a0..e680020b 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 8b149df7..f6ec7d2b 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 5c7bd6c4..4f107829 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 6ac476a1..a7f124fe 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 e040a2f6..c1c19e41 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 cf08d735..a4eaa7e6 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 ef6f2841..f24fcb20 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 cc1032a5..1d884ac6 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 4005515e..8e936fb1 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 2bc7da60..04d61cad 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 a0d54fdd..7256080d 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 6c1ae8d3..94996b7a 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 6ac217f9..36984748 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 -- Gitee