diff --git a/es2panda/compiler/core/dynamicContext.h b/es2panda/compiler/core/dynamicContext.h index 2e13faab6e9ab022393fa06168150f4af0fa2590..8edb42e5c2dd2331875e5dda377be4326fc97a2f 100644 --- a/es2panda/compiler/core/dynamicContext.h +++ b/es2panda/compiler/core/dynamicContext.h @@ -39,7 +39,7 @@ class DynamicContext { public: NO_COPY_SEMANTIC(DynamicContext); NO_MOVE_SEMANTIC(DynamicContext); - ~DynamicContext(); + virtual ~DynamicContext(); void *operator new(size_t) = delete; void *operator new[](size_t) = delete; diff --git a/es2panda/compiler/core/pandagen.cpp b/es2panda/compiler/core/pandagen.cpp index e6a9b03757be51262288ff86652e363693f91f44..7dcf427b52304bdb7e32952dcba69efa2a79f074 100644 --- a/es2panda/compiler/core/pandagen.cpp +++ b/es2panda/compiler/core/pandagen.cpp @@ -680,7 +680,7 @@ void PandaGen::Branch(const ir::AstNode *node, Label *label) sa_.Emit(node, label); } -bool PandaGen::CheckControlFlowChange() +bool PandaGen::CheckControlFlowChange() const { const auto *iter = dynamicContext_; diff --git a/es2panda/compiler/core/pandagen.h b/es2panda/compiler/core/pandagen.h index e7ac0ce6f29b6c39e4559c950d8f72ed5e567f74..1334ff54f6a0d9adff02e0280482425850e6d43f 100644 --- a/es2panda/compiler/core/pandagen.h +++ b/es2panda/compiler/core/pandagen.h @@ -220,7 +220,7 @@ public: LiteralBuffer *NewLiteralBuffer(); int32_t AddLiteralBuffer(LiteralBuffer *buf); - int32_t AddLexicalVarNamesForDebugInfo(ArenaMap> &lexicalMap); + int32_t AddLexicalVarNamesForDebugInfo(ArenaMap> &lexicalVars); void InitializeLexEnv(const ir::AstNode *node); void CopyFunctionArguments(const ir::AstNode *node); @@ -269,7 +269,7 @@ public: void SetLabel(const ir::AstNode *node, Label *label); void Branch(const ir::AstNode *node, class Label *label); - bool CheckControlFlowChange(); + bool CheckControlFlowChange() const; Label *ControlFlowChangeBreak(const ir::Identifier *label = nullptr); Label *ControlFlowChangeContinue(const ir::Identifier *label); diff --git a/es2panda/es2panda.cpp b/es2panda/es2panda.cpp index 81d07bbdb21a68a7143ac650951183e0a23c9839..0aa936fdf31680639bf01dbb402372f6ee2411f0 100644 --- a/es2panda/es2panda.cpp +++ b/es2panda/es2panda.cpp @@ -184,7 +184,7 @@ int Compiler::CompileFiles(CompilerOptions &options, return failed ? 1 : 0; } -panda::pandasm::Program *Compiler::CompileFile(CompilerOptions &options, SourceFile *src, +panda::pandasm::Program *Compiler::CompileFile(const CompilerOptions &options, SourceFile *src, util::SymbolTable *symbolTable) { std::string buffer; diff --git a/es2panda/es2panda.h b/es2panda/es2panda.h index 43cca7772c2388ce9f89d67da5d423c0cc51ef14..847a58000517283376c2139da38a6677678fe4e0 100644 --- a/es2panda/es2panda.h +++ b/es2panda/es2panda.h @@ -166,7 +166,7 @@ public: panda::pandasm::Program *Compile(const SourceFile &input, const CompilerOptions &options, util::SymbolTable *symbolTable = nullptr); - panda::pandasm::Program *CompileFile(CompilerOptions &options, SourceFile *src, util::SymbolTable *symbolTable); + panda::pandasm::Program *CompileFile(const CompilerOptions &options, SourceFile *src, util::SymbolTable *symbolTable); static int CompileFiles(CompilerOptions &options, std::map *cacheProgs, diff --git a/es2panda/parser/module/sourceTextModuleRecord.cpp b/es2panda/parser/module/sourceTextModuleRecord.cpp index 66cdf409daa3734b6516c58f0f78777797ec8b3b..a00b38ee757d2289ca85403262c869b17247ee2f 100644 --- a/es2panda/parser/module/sourceTextModuleRecord.cpp +++ b/es2panda/parser/module/sourceTextModuleRecord.cpp @@ -104,7 +104,7 @@ namespace panda::es2panda::parser { starExportEntries_.push_back(entry); } - bool SourceTextModuleRecord::HasDuplicateExport(util::StringView exportName) + bool SourceTextModuleRecord::HasDuplicateExport(util::StringView exportName) const { for (auto const &entryUnit : localExportEntries_) { const SourceTextModuleRecord::ExportEntry *e = entryUnit.second; diff --git a/es2panda/parser/module/sourceTextModuleRecord.h b/es2panda/parser/module/sourceTextModuleRecord.h index 674db844a6e396421e0da671fed2a42db6e8ac78..c16e43816112da97737a55ef4da4f14e7a3d5435 100644 --- a/es2panda/parser/module/sourceTextModuleRecord.h +++ b/es2panda/parser/module/sourceTextModuleRecord.h @@ -128,7 +128,7 @@ public: static constexpr std::string_view ANONY_NAMESPACE_NAME = "=ens"; private: - bool HasDuplicateExport(util::StringView exportName); + bool HasDuplicateExport(util::StringView exportName) const; void ConvertLocalExportToIndirect(ImportEntry *importEntry, ExportEntry *exportEntry); ArenaAllocator *allocator_; diff --git a/es2panda/parser/parserImpl.cpp b/es2panda/parser/parserImpl.cpp index 664faf665e2e91144e0734ba18d46bac27482a84..d1af23fd94602dd0ea13f2f36187190817674840 100644 --- a/es2panda/parser/parserImpl.cpp +++ b/es2panda/parser/parserImpl.cpp @@ -1411,7 +1411,7 @@ util::StringView GetTSPropertyName(ir::Expression *key) } } -void ParserImpl::CheckObjectTypeForDuplicatedProperties(ir::Expression *member, ArenaVector &members) +void ParserImpl::CheckObjectTypeForDuplicatedProperties(ir::Expression *member, ArenaVector const &members) { ir::Expression *key = nullptr; @@ -3479,7 +3479,7 @@ bool ParserImpl::CurrentTokenIsModifier(char32_t nextCp) const void ParserImpl::ThrowParameterModifierError(ir::ModifierFlags status) const { ThrowSyntaxError( - {"'", status & ir::ModifierFlags::STATIC ? "static" : status & ir::ModifierFlags::ASYNC ? "async" : "declare", + {"'", (status & ir::ModifierFlags::STATIC) ? "static" : ((status & ir::ModifierFlags::ASYNC) ? "async" : "declare") , "' modifier cannot appear on a parameter."}, lexer_->GetToken().Start()); } diff --git a/es2panda/parser/parserImpl.h b/es2panda/parser/parserImpl.h index ff4a6e6653321ab3128c1ae9b90af73c58ce13dd..f56762c96f94fd4413a2e8528df3f86ac6a6402d 100644 --- a/es2panda/parser/parserImpl.h +++ b/es2panda/parser/parserImpl.h @@ -325,7 +325,7 @@ private: ir::TSParameterProperty *CreateTsParameterProperty(ir::Expression *parameter, ir::ModifierFlags modifiers); ir::Expression *ParseFunctionParameter(bool isDeclare); void CreateTSVariableForProperty(ir::AstNode *node, const ir::Expression *key, binder::VariableFlags flags); - void CheckObjectTypeForDuplicatedProperties(ir::Expression *member, ArenaVector &members); + void CheckObjectTypeForDuplicatedProperties(ir::Expression *member, ArenaVector const &members); // ExpressionParser.Cpp @@ -370,7 +370,7 @@ private: ir::MetaProperty *ParsePotentialNewTarget(); void CheckInvalidDestructuring(const ir::AstNode *object) const; void ValidateParenthesizedExpression(ir::Expression *lhsExpression); - ir::Expression *ParseAssignmentExpression(ir::Expression *expression, + ir::Expression *ParseAssignmentExpression(ir::Expression *lhsExpression, ExpressionParseFlags flags = ExpressionParseFlags::NO_OPTS); ir::Expression *ParsePrimaryExpression(ExpressionParseFlags flags = ExpressionParseFlags::NO_OPTS); ir::NewExpression *ParseNewExpression(); diff --git a/es2panda/parser/statementParser.cpp b/es2panda/parser/statementParser.cpp index ffa8688480bf9dd559572bc8f493b5feca1e6889..6f5f0bc7d0e18b934e13e7c4a9d640f5e9994df5 100644 --- a/es2panda/parser/statementParser.cpp +++ b/es2panda/parser/statementParser.cpp @@ -998,7 +998,7 @@ ir::FunctionDeclaration *ParserImpl::ParseFunctionDeclaration(bool canBeAnonymou auto *funcDecl = AllocNode(func); funcDecl->SetRange(func->Range()); - binder::DeclarationFlags declflag = newStatus & ParserStatus::EXPORT_REACHED ? + binder::DeclarationFlags declflag = (newStatus & ParserStatus::EXPORT_REACHED) ? binder::DeclarationFlags::EXPORT : binder::DeclarationFlags::NONE; Binder()->AddDecl(startLoc, declflag, Allocator(), parser::SourceTextModuleRecord::DEFAULT_LOCAL_NAME, func); @@ -1030,7 +1030,7 @@ ir::FunctionDeclaration *ParserImpl::ParseFunctionDeclaration(bool canBeAnonymou auto *funcDecl = AllocNode(func); funcDecl->SetRange(func->Range()); - binder::DeclarationFlags declflag = newStatus & ParserStatus::EXPORT_REACHED ? + binder::DeclarationFlags declflag = (newStatus & ParserStatus::EXPORT_REACHED) ? binder::DeclarationFlags::EXPORT : binder::DeclarationFlags::NONE; if (Extension() == ScriptExtension::TS) { const auto &bindings = Binder()->GetScope()->Bindings(); @@ -1871,7 +1871,7 @@ ir::VariableDeclarator *ParserImpl::ParseVariableDeclarator(VariableParsingFlags for (const auto *binding : bindings) { binder::Decl *decl = nullptr; - binder::DeclarationFlags declflag = flags & VariableParsingFlags::EXPORTED ? + binder::DeclarationFlags declflag = (flags & VariableParsingFlags::EXPORTED) ? binder::DeclarationFlags::EXPORT : binder::DeclarationFlags::NONE; if (flags & VariableParsingFlags::VAR) { diff --git a/es2panda/typescript/checker.h b/es2panda/typescript/checker.h index b2da9878e9f1365827531a15e029fa2553b1326c..9cfee85d3169af60483091fe640aa07637608988 100644 --- a/es2panda/typescript/checker.h +++ b/es2panda/typescript/checker.h @@ -257,7 +257,7 @@ public: return globalTypes_->GlobalErrorType(); } - CheckerContext Context() + CheckerContext Context() const { return context_; } diff --git a/es2panda/typescript/core/destructuringContext.h b/es2panda/typescript/core/destructuringContext.h index 4ca0c17a4f4ccf614ff82282c6c7c4cf3138dab1..5bee457710a2018de603d8cc81bdce09d0e94ddf 100644 --- a/es2panda/typescript/core/destructuringContext.h +++ b/es2panda/typescript/core/destructuringContext.h @@ -63,7 +63,7 @@ public: DEFAULT_COPY_SEMANTIC(DestructuringContext); DEFAULT_MOVE_SEMANTIC(DestructuringContext); - ~DestructuringContext() = default; + virtual ~DestructuringContext() = default; virtual void Start() = 0; virtual void ValidateInferedType() = 0; diff --git a/es2panda/util/dumper.cpp b/es2panda/util/dumper.cpp index 8fd3ff4e6b65a78ac71e77d54d01468ef714ec69..0b5e38fe88d8c1b25197353650b261452210070c 100644 --- a/es2panda/util/dumper.cpp +++ b/es2panda/util/dumper.cpp @@ -16,7 +16,7 @@ namespace panda::es2panda::util { -void Dumper::DumpLiterals(std::map &literalTable) +void Dumper::DumpLiterals(std::map const &literalTable) { std::cout << "======> literal array buffer <======" << std::endl; for (auto it : literalTable) { diff --git a/es2panda/util/dumper.h b/es2panda/util/dumper.h index 4024fb0c253a889a8143dcc6de4fcacb9972a35a..cdfa7c7cb679c6769518fbcd588c33c6f5602792 100644 --- a/es2panda/util/dumper.h +++ b/es2panda/util/dumper.h @@ -25,7 +25,7 @@ namespace panda::es2panda::util { class Dumper { public: - static void DumpLiterals(std::map &literalTable); + static void DumpLiterals(std::map const &literalTable); }; } // namespace panda::es2panda::util diff --git a/es2panda/util/hotfix.cpp b/es2panda/util/hotfix.cpp index 0a303b34db82656788789c589ca5f3a1aedd0820..523247d35251f0cf986b6601c428e8d7d5f689e1 100644 --- a/es2panda/util/hotfix.cpp +++ b/es2panda/util/hotfix.cpp @@ -202,7 +202,7 @@ void Hotfix::CollectClassMemberFunctions(const std::string &className, int64_t b classMemberFunctions_.insert({className, classMemberFunctions}); } -bool Hotfix::IsScopeValidToPatchLexical(binder::VariableScope *scope) +bool Hotfix::IsScopeValidToPatchLexical(binder::VariableScope *scope) const { if (!generatePatch_) { return false; diff --git a/es2panda/util/hotfix.h b/es2panda/util/hotfix.h index 004d98b10cea552ce49c6402d2fef5c399b42408..0206acd1eca3ba0b0578c1fa041cda175082909a 100644 --- a/es2panda/util/hotfix.h +++ b/es2panda/util/hotfix.h @@ -56,7 +56,7 @@ public: } void Finalize(panda::pandasm::Program **prog); - bool IsScopeValidToPatchLexical(binder::VariableScope *scope); + bool IsScopeValidToPatchLexical(binder::VariableScope *scope) const; uint32_t GetSlotIdFromSymbolTable(const std::string &variableName); void AllocSlotfromPatchEnv(const std::string &variableName); uint32_t GetPatchLexicalIdx(const std::string &variableName); diff --git a/es2panda/util/symbolTable.h b/es2panda/util/symbolTable.h index 884ad13177b9e9ffeab88104fc3a09e148e4ee0c..6d27b55a8f2a317a9a08587744cc6c3d2450f198 100644 --- a/es2panda/util/symbolTable.h +++ b/es2panda/util/symbolTable.h @@ -57,7 +57,7 @@ public: private: bool ReadSymbolTable(const std::string &symbolTable); - std::vector GetStringItems(std::string_view input, const std::string &delimiter); + std::vector GetStringItems(std::string_view input, const std::string &separator); std::mutex m_; std::string symbolTable_; diff --git a/es2panda/util/ustring.cpp b/es2panda/util/ustring.cpp index bc06b9660116d64ac855e4e07122f25a1b5a2182..df7974b639f7f79b1c7b8997031a0e7fe5c3660b 100644 --- a/es2panda/util/ustring.cpp +++ b/es2panda/util/ustring.cpp @@ -51,7 +51,7 @@ std::tuple StringView::EncodeSurrogate(char32_t cp) return {cu1, cu2}; } -void StringView::Iterator::SkipCp() +void StringView::Iterator::SkipCp() const { if (!HasNext()) { return; diff --git a/es2panda/util/ustring.h b/es2panda/util/ustring.h index b9840800376f842f28e66d1b6789011ec44398af..f3df4024f160eeccc96bf9d4f3ceac601895d64d 100644 --- a/es2panda/util/ustring.h +++ b/es2panda/util/ustring.h @@ -170,12 +170,12 @@ public: return DecodeCP(cpSize); } - inline void Forward(size_t offset) + inline void Forward(size_t offset) const { iter_ += offset; } - inline void Backward(size_t offset) + inline void Backward(size_t offset) const { iter_ -= offset; } @@ -185,7 +185,7 @@ public: iter_ = sv_.begin() + offset; } - inline void Rewind(std::string_view::const_iterator pos) + inline void Rewind(std::string_view::const_iterator pos) const { iter_ = pos; } @@ -200,7 +200,7 @@ public: return iter_ != sv_.end(); } - void SkipCp(); + void SkipCp() const; private: template diff --git a/merge_abc/src/assemblyFunctionProto.h b/merge_abc/src/assemblyFunctionProto.h index 6346cadc52af0de4acdca651092f1691c3580268..36da65ac4194a85b0f87592bd3b98718107447ff 100644 --- a/merge_abc/src/assemblyFunctionProto.h +++ b/merge_abc/src/assemblyFunctionProto.h @@ -38,14 +38,14 @@ class Parameter { public: static void Serialize(const panda::pandasm::Function::Parameter ¶m, protoPanda::Parameter &protoParam); static void Deserialize(const protoPanda::Parameter &protoParam, panda::pandasm::Function::Parameter ¶m, - panda::ArenaAllocator *allocator_); + panda::ArenaAllocator *allocator); }; class Function { public: static void Serialize(const panda::pandasm::Function &function, protoPanda::Function &protoFunction); static void Deserialize(const protoPanda::Function &protoFunction, panda::pandasm::Function &function, - panda::ArenaAllocator *allocator_); + panda::ArenaAllocator *allocator); }; } // panda::proto #endif diff --git a/merge_abc/src/metaProto.cpp b/merge_abc/src/metaProto.cpp index fd70b2640699508a349ad681bc8c287e3f120972..5dfc89c424c751b2be87ab0fec899fb3fbce9140 100644 --- a/merge_abc/src/metaProto.cpp +++ b/merge_abc/src/metaProto.cpp @@ -31,7 +31,7 @@ void RecordMetadata::Deserialize(const protoPanda::RecordMetadata &protoMeta, auto &protoAnnoMetadata = protoItemMetadata.father(); AnnotationMetadata::Deserialize(protoAnnoMetadata, *meta, allocator); - auto &protoMetadata = protoAnnoMetadata.father(); + const auto &protoMetadata = protoAnnoMetadata.father(); Metadata::Deserialize(protoMetadata, *meta); } @@ -52,7 +52,7 @@ void FunctionMetadata::Deserialize(const protoPanda::FunctionMetadata &protoMeta auto &protoAnnoMetadata = protoItemMetadata.father(); AnnotationMetadata::Deserialize(protoAnnoMetadata, *meta, allocator); - auto &protoMetadata = protoAnnoMetadata.father(); + const auto &protoMetadata = protoAnnoMetadata.father(); Metadata::Deserialize(protoMetadata, *meta); } @@ -77,7 +77,7 @@ void FieldMetadata::Deserialize(const protoPanda::FieldMetadata &protoMeta, ItemMetadata::Deserialize(protoItemMetadata, *meta); auto &protoAnnoMetadata = protoItemMetadata.father(); AnnotationMetadata::Deserialize(protoAnnoMetadata, *meta, allocator); - auto &protoMetadata = protoAnnoMetadata.father(); + const auto &protoMetadata = protoAnnoMetadata.father(); Metadata::Deserialize(protoMetadata, *meta); auto &fieldType = Type::Deserialize(protoMeta.fieldtype(), allocator); @@ -99,7 +99,7 @@ void ParamMetadata::Deserialize(const protoPanda::ParamMetadata &protoMeta, std::unique_ptr &meta, panda::ArenaAllocator *allocator) { - auto &protoAnnoMetadata = protoMeta.father(); + const auto &protoAnnoMetadata = protoMeta.father(); AnnotationMetadata::Deserialize(protoAnnoMetadata, *meta, allocator); } diff --git a/merge_abc/src/protobufSnapshotGenerator.cpp b/merge_abc/src/protobufSnapshotGenerator.cpp index 112e88f4e149d944defe6e60da3cbc6a6a7fd7b3..daeee4716cfdaccb3b4ca56182bacbd64723ea01 100644 --- a/merge_abc/src/protobufSnapshotGenerator.cpp +++ b/merge_abc/src/protobufSnapshotGenerator.cpp @@ -51,7 +51,7 @@ void ProtobufSnapshotGenerator::GenerateProgram(const std::string &inputName, pa void ProtobufSnapshotGenerator::UpdateCacheFile( const std::map &compositeProgramMap, - bool &isDebug, const std::string &cacheFilePath) + const bool &isDebug, const std::string &cacheFilePath) { protoPanda::CompositeProgram protoCompositeProgram; CompositeProgram::Serialize(compositeProgramMap, isDebug, protoCompositeProgram); diff --git a/merge_abc/src/protobufSnapshotGenerator.h b/merge_abc/src/protobufSnapshotGenerator.h index f1da5d27c9be89bf7e3eb6e08f01fa394d9455bd..598143b42dc97f59cd233555929b3369b70376ca 100644 --- a/merge_abc/src/protobufSnapshotGenerator.h +++ b/merge_abc/src/protobufSnapshotGenerator.h @@ -22,13 +22,13 @@ namespace panda::proto { class ProtobufSnapshotGenerator { public: - static void GenerateSnapshot(const panda::pandasm::Program &prog, const std::string &outputName); + static void GenerateSnapshot(const panda::pandasm::Program &program, const std::string &outputName); static void GenerateProgram(const std::string &inputName, panda::pandasm::Program &prog, panda::ArenaAllocator *allocator); static std::map *GetCacheContext( const std::string &cacheFilePath, bool isDebug, panda::ArenaAllocator *allocator); - static void UpdateCacheFile(const std::map &compositeProgram, - bool &isDebug, const std::string &cacheFilePath); + static void UpdateCacheFile(const std::map &compositeProgramMap, + const bool &isDebug, const std::string &cacheFilePath); }; } // panda::proto #endif diff --git a/ts2panda/ts2abc/ts2abc.cpp b/ts2panda/ts2abc/ts2abc.cpp index c366e097f0eeba847590571fb352db285ddffce6..db81b9f50ebf67944edac2334c3037c2a45f9aad 100644 --- a/ts2panda/ts2abc/ts2abc.cpp +++ b/ts2panda/ts2abc/ts2abc.cpp @@ -1283,7 +1283,7 @@ static bool IsStartOrEndPosition(int idx, char *buff, const std::string &data) return false; } -static bool HandleBuffer(int &ret, bool &isStartDollar, char *buff, std::string &data, panda::pandasm::Program &prog) +static bool HandleBuffer(const int &ret, bool &isStartDollar, char *buff, std::string &data, panda::pandasm::Program &prog) { uint32_t startPos = 0; for (int idx = 0; idx < ret; idx++) {