diff --git a/ets2panda/checker/ASchecker.cpp b/ets2panda/checker/ASchecker.cpp
index 492c3b5d7a52df22cf6c1b6ce471290751c3e120..3f096b5ce26ac987146c0e414621a175f75b9eb4 100644
--- a/ets2panda/checker/ASchecker.cpp
+++ b/ets2panda/checker/ASchecker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ASchecker.h b/ets2panda/checker/ASchecker.h
index d2840c05332312e2a9fee333e3e0714b1ac6ef91..7dad82f861bbc3fda799a39ba111d23b5a8def83 100644
--- a/ets2panda/checker/ASchecker.h
+++ b/ets2panda/checker/ASchecker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ETSAnalyzer.cpp b/ets2panda/checker/ETSAnalyzer.cpp
index 1b18db86c4a0cd71e901844ad228d72eebb6614b..e108f48e27a6daa3e4230bc171003687eed6e73a 100644
--- a/ets2panda/checker/ETSAnalyzer.cpp
+++ b/ets2panda/checker/ETSAnalyzer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "ETSAnalyzer.h"
 
 #include "varbinder/varbinder.h"
@@ -687,6 +688,181 @@ checker::Type *ETSAnalyzer::Check(ir::LabelledStatement *st) const
     UNREACHABLE();
 }
 
+
+void CheckArgumentVoidType(checker::Type *&func_return_type, ETSChecker *&checker, const std::string &name,
+                   ir::ReturnStatement *st)
+{
+    if (name.find(compiler::Signatures::ETS_MAIN_WITH_MANGLE_BEGIN) != std::string::npos) {
+        if (func_return_type == checker->GlobalBuiltinVoidType()) {
+            func_return_type = checker->GlobalVoidType();
+        } else if (!func_return_type->IsETSVoidType() && !func_return_type->IsIntType()) {
+            checker->ThrowTypeError("Bad return type, main enable only void or int type.", st->Start());
+        }
+    }
+}
+
+void CheckMissingArgumentType(checker::Type *&func_return_type, ETSChecker *checker,
+                              ir::ScriptFunction *containing_func, ir::ReturnStatement *st)
+{
+    if (!func_return_type->IsETSVoidType() && func_return_type != checker->GlobalBuiltinVoidType()) {
+        checker->ThrowTypeError("Missing return value.", st->Start());
+    }
+    func_return_type =
+        containing_func->IsEntryPoint() ? checker->GlobalVoidType() : checker->GlobalBuiltinVoidType();
+}
+
+void CheckObjectExpressionType(ir::Expression *st_argument, checker::Type *func_return_type)
+{
+    if (st_argument->IsObjectExpression()) {
+        st_argument->AsObjectExpression()->SetPreferredType(func_return_type);
+    }
+}
+
+void CheckMemberExpressionType(ir::Expression *st_argument, ETSChecker *checker, checker::Type *func_return_type)
+{
+    if (st_argument->IsMemberExpression()) {
+        checker->SetArrayPreferredTypeForNestedMemberExpressions(st_argument->AsMemberExpression(),
+                                                                    func_return_type);
+    }
+}
+
+void CheckReturnType(ETSChecker *checker, checker::Type *func_return_type, checker::Type *argument_type,
+                     ir::Expression *st_argument)
+{
+    if (func_return_type->IsETSVoidType() || func_return_type == checker->GlobalBuiltinVoidType()) {
+        if (argument_type != checker->GlobalVoidType() && argument_type != checker->GlobalBuiltinVoidType()) {
+            checker->ThrowTypeError("Unexpected return value, enclosing method return type is void.",
+                                    st_argument->Start());
+        }
+    } else {
+        checker::AssignmentContext(
+            checker->Relation(), st_argument, argument_type, func_return_type, st_argument->Start(),
+            {"Return statement type is not compatible with the enclosing method's return type."},
+            checker::TypeRelationFlag::DIRECT_RETURN);
+    }
+}
+
+void CheckSignatureFlag(ETSChecker *checker, ir::ScriptFunction *containing_func, checker::Type *&func_return_type,
+                        ir::Expression *st_argument)
+{
+    //  First (or single) return statement in the function:
+    func_return_type =
+        st_argument == nullptr ? checker->GlobalBuiltinVoidType() : st_argument->Check(checker);
+    if (func_return_type->HasTypeFlag(checker::TypeFlag::CONSTANT)) {
+        // remove CONSTANT type modifier if exists
+        func_return_type = func_return_type->Instantiate(checker->Allocator(), checker->Relation(),
+                                                            checker->GetGlobalTypesHolder());
+        func_return_type->RemoveTypeFlag(checker::TypeFlag::CONSTANT);
+    }
+
+    containing_func->Signature()->SetReturnType(func_return_type);
+    containing_func->Signature()->RemoveSignatureFlag(checker::SignatureFlags::NEED_RETURN_TYPE);
+    checker->VarBinder()->AsETSBinder()->BuildFunctionName(containing_func);
+
+    if (st_argument != nullptr && st_argument->IsObjectExpression()) {
+        st_argument->AsObjectExpression()->SetPreferredType(func_return_type);
+    }
+}
+
+void CheckNoSignatureFlag(ETSChecker *checker, ir::ScriptFunction *containing_func, checker::Type *&func_return_type,
+                        ir::ReturnStatement *st, ir::Expression *st_argument)
+{
+    func_return_type = containing_func->Signature()->ReturnType();
+
+    if (st_argument == nullptr) {
+        // previous return statement(s) have value
+        if (!func_return_type->IsETSVoidType() && func_return_type != checker->GlobalBuiltinVoidType()) {
+            checker->ThrowTypeError("All return statements in the function should be empty or have a value.",
+                                    st->Start());
+        }
+    } else {
+        //  previous return statement(s) don't have any value
+        if (func_return_type->IsETSVoidType() || func_return_type == checker->GlobalBuiltinVoidType()) {
+            checker->ThrowTypeError("All return statements in the function should be empty or have a value.",
+                                    st_argument->Start());
+        }
+
+        const auto name = containing_func->Scope()->InternalName().Mutf8();
+        if (name.find(compiler::Signatures::ETS_MAIN_WITH_MANGLE_BEGIN) != std::string::npos) {
+            if (func_return_type == checker->GlobalBuiltinVoidType()) {
+                func_return_type = checker->GlobalVoidType();
+            } else if (!func_return_type->IsETSVoidType() && !func_return_type->IsIntType()) {
+                checker->ThrowTypeError("Bad return type, main enable only void or int type.", st->Start());
+            }
+        }
+
+        if (st_argument->IsObjectExpression()) {
+            st_argument->AsObjectExpression()->SetPreferredType(func_return_type);
+        }
+
+        if (st_argument->IsMemberExpression()) {
+            checker->SetArrayPreferredTypeForNestedMemberExpressions(st_argument->AsMemberExpression(),
+                                                                     func_return_type);
+        }
+
+        checker::Type *argument_type = st_argument->Check(checker);
+        // remove CONSTANT type modifier if exists
+        if (argument_type->HasTypeFlag(checker::TypeFlag::CONSTANT)) {
+            argument_type = argument_type->Instantiate(checker->Allocator(), checker->Relation(),
+                                                       checker->GetGlobalTypesHolder());
+            argument_type->RemoveTypeFlag(checker::TypeFlag::CONSTANT);
+        }
+
+        auto *const relation = checker->Relation();
+        relation->SetNode(st_argument);
+
+        if (!relation->IsIdenticalTo(func_return_type, argument_type)) {
+            if (func_return_type->HasTypeFlag(checker::TypeFlag::ETS_ARRAY_OR_OBJECT) ||
+                argument_type->HasTypeFlag(checker::TypeFlag::ETS_ARRAY_OR_OBJECT)) {
+                // function return type should be of reference (object) type
+                relation->SetFlags(checker::TypeRelationFlag::NONE);
+
+                if (!argument_type->HasTypeFlag(checker::TypeFlag::ETS_ARRAY_OR_OBJECT)) {
+                    argument_type = checker->PrimitiveTypeAsETSBuiltinType(argument_type);
+                    if (argument_type == nullptr) {
+                        checker->ThrowTypeError("Invalid return statement expression", st_argument->Start());
+                    }
+                    st_argument->AddBoxingUnboxingFlag(checker->GetBoxingFlag(argument_type));
+                }
+
+                if (!func_return_type->HasTypeFlag(checker::TypeFlag::ETS_ARRAY_OR_OBJECT)) {
+                    func_return_type = checker->PrimitiveTypeAsETSBuiltinType(func_return_type);
+                    if (func_return_type == nullptr) {
+                        checker->ThrowTypeError("Invalid return function expression", st->Start());
+                    }
+                }
+
+                func_return_type = checker->FindLeastUpperBound(func_return_type, argument_type);
+                containing_func->Signature()->SetReturnType(func_return_type);
+                containing_func->Signature()->AddSignatureFlag(checker::SignatureFlags::INFERRED_RETURN_TYPE);
+            } else if (func_return_type->HasTypeFlag(checker::TypeFlag::ETS_PRIMITIVE_RETURN) &&
+                        argument_type->HasTypeFlag(checker::TypeFlag::ETS_PRIMITIVE_RETURN)) {
+                // function return type is of primitive type (including enums):
+                relation->SetFlags(checker::TypeRelationFlag::DIRECT_RETURN |
+                                    checker::TypeRelationFlag::IN_ASSIGNMENT_CONTEXT |
+                                    checker::TypeRelationFlag::ASSIGNMENT_CONTEXT);
+                if (relation->IsAssignableTo(func_return_type, argument_type)) {
+                    func_return_type = argument_type;
+                    containing_func->Signature()->SetReturnType(func_return_type);
+                    containing_func->Signature()->AddSignatureFlag(
+                        checker::SignatureFlags::INFERRED_RETURN_TYPE);
+                } else if (!relation->IsAssignableTo(argument_type, func_return_type)) {
+                    checker->ThrowTypeError(
+                        "Return statement type is not compatible with previous method's return statement "
+                        "type(s).",
+                        st_argument->Start());
+                }
+
+            } else {
+                checker->ThrowTypeError("Invalid return statement type(s).", st->Start());
+            }
+        }
+
+        relation->SetNode(nullptr);
+        relation->SetFlags(checker::TypeRelationFlag::NONE);
+    }
+}
+
 checker::Type *ETSAnalyzer::Check(ir::ReturnStatement *st) const
 {
     ETSChecker *checker = GetETSChecker();
@@ -712,160 +888,24 @@ checker::Type *ETSAnalyzer::Check(ir::ReturnStatement *st) const
         func_return_type = checker->GetTypeFromTypeAnnotation(return_type_annotation);
 
         if (st->argument_ == nullptr) {
-            if (!func_return_type->IsETSVoidType() && func_return_type != checker->GlobalBuiltinVoidType()) {
-                checker->ThrowTypeError("Missing return value.", st->Start());
-            }
-            func_return_type =
-                containing_func->IsEntryPoint() ? checker->GlobalVoidType() : checker->GlobalBuiltinVoidType();
+            CheckMissingArgumentType(func_return_type, checker, containing_func, st);
         } else {
             const auto name = containing_func->Scope()->InternalName().Mutf8();
-            if (name.find(compiler::Signatures::ETS_MAIN_WITH_MANGLE_BEGIN) != std::string::npos) {
-                if (func_return_type == checker->GlobalBuiltinVoidType()) {
-                    func_return_type = checker->GlobalVoidType();
-                } else if (!func_return_type->IsETSVoidType() && !func_return_type->IsIntType()) {
-                    checker->ThrowTypeError("Bad return type, main enable only void or int type.", st->Start());
-                }
-            }
-
-            if (st->argument_->IsObjectExpression()) {
-                st->argument_->AsObjectExpression()->SetPreferredType(func_return_type);
-            }
-
-            if (st->argument_->IsMemberExpression()) {
-                checker->SetArrayPreferredTypeForNestedMemberExpressions(st->argument_->AsMemberExpression(),
-                                                                         func_return_type);
-            }
+            CheckArgumentVoidType(func_return_type, checker, name, st);
+            CheckObjectExpressionType(st->argument_, func_return_type);
+            CheckMemberExpressionType(st->argument_, checker, func_return_type);
 
             checker::Type *argument_type = st->argument_->Check(checker);
 
-            if (func_return_type->IsETSVoidType() || func_return_type == checker->GlobalBuiltinVoidType()) {
-                if (argument_type != checker->GlobalVoidType() && argument_type != checker->GlobalBuiltinVoidType()) {
-                    checker->ThrowTypeError("Unexpected return value, enclosing method return type is void.",
-                                            st->argument_->Start());
-                }
-            } else {
-                checker::AssignmentContext(
-                    checker->Relation(), st->argument_, argument_type, func_return_type, st->argument_->Start(),
-                    {"Return statement type is not compatible with the enclosing method's return type."},
-                    checker::TypeRelationFlag::DIRECT_RETURN);
-            }
+            CheckReturnType(checker, func_return_type, argument_type, st->argument_);
         }
     } else {
         //  Case when function's return type should be inferred from return statement(s):
         if (containing_func->Signature()->HasSignatureFlag(checker::SignatureFlags::NEED_RETURN_TYPE)) {
-            //  First (or single) return statement in the function:
-            func_return_type =
-                st->argument_ == nullptr ? checker->GlobalBuiltinVoidType() : st->argument_->Check(checker);
-            if (func_return_type->HasTypeFlag(checker::TypeFlag::CONSTANT)) {
-                // remove CONSTANT type modifier if exists
-                func_return_type = func_return_type->Instantiate(checker->Allocator(), checker->Relation(),
-                                                                 checker->GetGlobalTypesHolder());
-                func_return_type->RemoveTypeFlag(checker::TypeFlag::CONSTANT);
-            }
-
-            containing_func->Signature()->SetReturnType(func_return_type);
-            containing_func->Signature()->RemoveSignatureFlag(checker::SignatureFlags::NEED_RETURN_TYPE);
-            checker->VarBinder()->AsETSBinder()->BuildFunctionName(containing_func);
-
-            if (st->argument_ != nullptr && st->argument_->IsObjectExpression()) {
-                st->argument_->AsObjectExpression()->SetPreferredType(func_return_type);
-            }
+            CheckSignatureFlag(checker, containing_func, func_return_type, st->argument_);
         } else {
             //  All subsequent return statements:
-            func_return_type = containing_func->Signature()->ReturnType();
-
-            if (st->argument_ == nullptr) {
-                // previous return statement(s) have value
-                if (!func_return_type->IsETSVoidType() && func_return_type != checker->GlobalBuiltinVoidType()) {
-                    checker->ThrowTypeError("All return statements in the function should be empty or have a value.",
-                                            st->Start());
-                }
-            } else {
-                //  previous return statement(s) don't have any value
-                if (func_return_type->IsETSVoidType() || func_return_type == checker->GlobalBuiltinVoidType()) {
-                    checker->ThrowTypeError("All return statements in the function should be empty or have a value.",
-                                            st->argument_->Start());
-                }
-
-                const auto name = containing_func->Scope()->InternalName().Mutf8();
-                if (name.find(compiler::Signatures::ETS_MAIN_WITH_MANGLE_BEGIN) != std::string::npos) {
-                    if (func_return_type == checker->GlobalBuiltinVoidType()) {
-                        func_return_type = checker->GlobalVoidType();
-                    } else if (!func_return_type->IsETSVoidType() && !func_return_type->IsIntType()) {
-                        checker->ThrowTypeError("Bad return type, main enable only void or int type.", st->Start());
-                    }
-                }
-
-                if (st->argument_->IsObjectExpression()) {
-                    st->argument_->AsObjectExpression()->SetPreferredType(func_return_type);
-                }
-
-                if (st->argument_->IsMemberExpression()) {
-                    checker->SetArrayPreferredTypeForNestedMemberExpressions(st->argument_->AsMemberExpression(),
-                                                                             func_return_type);
-                }
-
-                checker::Type *argument_type = st->argument_->Check(checker);
-                // remove CONSTANT type modifier if exists
-                if (argument_type->HasTypeFlag(checker::TypeFlag::CONSTANT)) {
-                    argument_type = argument_type->Instantiate(checker->Allocator(), checker->Relation(),
-                                                               checker->GetGlobalTypesHolder());
-                    argument_type->RemoveTypeFlag(checker::TypeFlag::CONSTANT);
-                }
-
-                auto *const relation = checker->Relation();
-                relation->SetNode(st->argument_);
-
-                if (!relation->IsIdenticalTo(func_return_type, argument_type)) {
-                    if (func_return_type->HasTypeFlag(checker::TypeFlag::ETS_ARRAY_OR_OBJECT) ||
-                        argument_type->HasTypeFlag(checker::TypeFlag::ETS_ARRAY_OR_OBJECT)) {
-                        // function return type should be of reference (object) type
-                        relation->SetFlags(checker::TypeRelationFlag::NONE);
-
-                        if (!argument_type->HasTypeFlag(checker::TypeFlag::ETS_ARRAY_OR_OBJECT)) {
-                            argument_type = checker->PrimitiveTypeAsETSBuiltinType(argument_type);
-                            if (argument_type == nullptr) {
-                                checker->ThrowTypeError("Invalid return statement expression", st->argument_->Start());
-                            }
-                            st->argument_->AddBoxingUnboxingFlag(checker->GetBoxingFlag(argument_type));
-                        }
-
-                        if (!func_return_type->HasTypeFlag(checker::TypeFlag::ETS_ARRAY_OR_OBJECT)) {
-                            func_return_type = checker->PrimitiveTypeAsETSBuiltinType(func_return_type);
-                            if (func_return_type == nullptr) {
-                                checker->ThrowTypeError("Invalid return function expression", st->Start());
-                            }
-                        }
-
-                        func_return_type = checker->FindLeastUpperBound(func_return_type, argument_type);
-                        containing_func->Signature()->SetReturnType(func_return_type);
-                        containing_func->Signature()->AddSignatureFlag(checker::SignatureFlags::INFERRED_RETURN_TYPE);
-                    } else if (func_return_type->HasTypeFlag(checker::TypeFlag::ETS_PRIMITIVE_RETURN) &&
-                               argument_type->HasTypeFlag(checker::TypeFlag::ETS_PRIMITIVE_RETURN)) {
-                        // function return type is of primitive type (including enums):
-                        relation->SetFlags(checker::TypeRelationFlag::DIRECT_RETURN |
-                                           checker::TypeRelationFlag::IN_ASSIGNMENT_CONTEXT |
-                                           checker::TypeRelationFlag::ASSIGNMENT_CONTEXT);
-                        if (relation->IsAssignableTo(func_return_type, argument_type)) {
-                            func_return_type = argument_type;
-                            containing_func->Signature()->SetReturnType(func_return_type);
-                            containing_func->Signature()->AddSignatureFlag(
-                                checker::SignatureFlags::INFERRED_RETURN_TYPE);
-                        } else if (!relation->IsAssignableTo(argument_type, func_return_type)) {
-                            checker->ThrowTypeError(
-                                "Return statement type is not compatible with previous method's return statement "
-                                "type(s).",
-                                st->argument_->Start());
-                        }
-
-                    } else {
-                        checker->ThrowTypeError("Invalid return statement type(s).", st->Start());
-                    }
-                }
-
-                relation->SetNode(nullptr);
-                relation->SetFlags(checker::TypeRelationFlag::NONE);
-            }
+            CheckNoSignatureFlag(checker, containing_func, func_return_type, st, st->argument_);
         }
     }
 
diff --git a/ets2panda/checker/ETSAnalyzer.h b/ets2panda/checker/ETSAnalyzer.h
index 7bc4f8a620d0ad44391157385a74ee2919de8498..de2b57cc58f1221ba182913a895318b90abe91fd 100644
--- a/ets2panda/checker/ETSAnalyzer.h
+++ b/ets2panda/checker/ETSAnalyzer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ETSchecker.cpp b/ets2panda/checker/ETSchecker.cpp
index 7a088cb5b61ad3dbd71159cbe7ac30cc2b32c22c..b3271a635dd7c7b264cb6f4645d12c9b50e85761 100644
--- a/ets2panda/checker/ETSchecker.cpp
+++ b/ets2panda/checker/ETSchecker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ETSchecker.h b/ets2panda/checker/ETSchecker.h
index 79927a9efd664cfcb41eb5fdce88a7fbe92a0add..f1eda74ff4b811afa234eb2f6de9afe8d659a4eb 100644
--- a/ets2panda/checker/ETSchecker.h
+++ b/ets2panda/checker/ETSchecker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/JSchecker.cpp b/ets2panda/checker/JSchecker.cpp
index c86bd4ddf1761977bd1bac45b445739a76f16c0e..5b72fec1c2e5b3e7fb44add5f59787d31a4f2457 100644
--- a/ets2panda/checker/JSchecker.cpp
+++ b/ets2panda/checker/JSchecker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/JSchecker.h b/ets2panda/checker/JSchecker.h
index 9dd522c283243e1b1fa7247a5321ee1227ef5106..adfa71ef13029878b5a33e1daedc1afade6208b8 100644
--- a/ets2panda/checker/JSchecker.h
+++ b/ets2panda/checker/JSchecker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/SemanticAnalyzer.h b/ets2panda/checker/SemanticAnalyzer.h
index 0cb278a5561912a283fb507930aa21a69469399a..76c7edac97cf9897295cfcb808c8202bbaf0080b 100644
--- a/ets2panda/checker/SemanticAnalyzer.h
+++ b/ets2panda/checker/SemanticAnalyzer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/TSAnalyzer.cpp b/ets2panda/checker/TSAnalyzer.cpp
index 6b42c2deb681f0d36cb4402187745b155a66a41c..7f6acbba2ad8ef1f6fe7b4bb075ed4c6a7e0c546 100644
--- a/ets2panda/checker/TSAnalyzer.cpp
+++ b/ets2panda/checker/TSAnalyzer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/TSAnalyzer.h b/ets2panda/checker/TSAnalyzer.h
index 72f353f284fd76ee7e5630162d1708926a42fcb0..eb23fa2fc5c919df6b4b822e49429c8c3775b349 100644
--- a/ets2panda/checker/TSAnalyzer.h
+++ b/ets2panda/checker/TSAnalyzer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/TSchecker.cpp b/ets2panda/checker/TSchecker.cpp
index 672834816b93bb785e1be55bbdc7d0f097f96211..6a9eb3977e56b87d2790f40def815bfd80dab5bc 100644
--- a/ets2panda/checker/TSchecker.cpp
+++ b/ets2panda/checker/TSchecker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/TSchecker.h b/ets2panda/checker/TSchecker.h
index 37d45b60ac604388b80645124eea48fb22eaad81..53ac7cdcb9d1b1f2d400d2a0deaa0b7bab15c839 100644
--- a/ets2panda/checker/TSchecker.h
+++ b/ets2panda/checker/TSchecker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/aliveAnalyzer.cpp b/ets2panda/checker/ets/aliveAnalyzer.cpp
index bcc0bb107f31cfdaf377b3ad4f7994d0662be354..626e17ade8d5b72cd6c475a955507fab7325ee26 100644
--- a/ets2panda/checker/ets/aliveAnalyzer.cpp
+++ b/ets2panda/checker/ets/aliveAnalyzer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/aliveAnalyzer.h b/ets2panda/checker/ets/aliveAnalyzer.h
index c9c80f2d01903e2246c3cb2b3d7724622b4d4852..08539b32fde59843298fdadd4ff231b625a1e02b 100644
--- a/ets2panda/checker/ets/aliveAnalyzer.h
+++ b/ets2panda/checker/ets/aliveAnalyzer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/arithmetic.cpp b/ets2panda/checker/ets/arithmetic.cpp
index 6f112eb89d7d43c64e7c3e1da884f771e7c53faf..9cb2bdbe06baa8cc1d04803dce3342f57cc8f75c 100644
--- a/ets2panda/checker/ets/arithmetic.cpp
+++ b/ets2panda/checker/ets/arithmetic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/arithmetic.h b/ets2panda/checker/ets/arithmetic.h
index 5471d52e97513f69a28659423bd5e945df52dfa9..0eb9a9792986862aa336fb6fd436f3af3e9bb80e 100644
--- a/ets2panda/checker/ets/arithmetic.h
+++ b/ets2panda/checker/ets/arithmetic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/baseAnalyzer.cpp b/ets2panda/checker/ets/baseAnalyzer.cpp
index 18cbe6fe290720718977c749ac22c4fa89574be5..68e18c435e76110def8f92834b07c84bff205c93 100644
--- a/ets2panda/checker/ets/baseAnalyzer.cpp
+++ b/ets2panda/checker/ets/baseAnalyzer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/baseAnalyzer.h b/ets2panda/checker/ets/baseAnalyzer.h
index 039fbe34f6ca7e7f87cd68d084ac2940fcaa4293..48e340531a4094f13ebf914aca956e26232cca67 100644
--- a/ets2panda/checker/ets/baseAnalyzer.h
+++ b/ets2panda/checker/ets/baseAnalyzer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/boxingConverter.cpp b/ets2panda/checker/ets/boxingConverter.cpp
index 5bc90847f7c58b122928823161922c005dcca5c2..71960110b37092f98e80bbeabec1312df40ae8c5 100644
--- a/ets2panda/checker/ets/boxingConverter.cpp
+++ b/ets2panda/checker/ets/boxingConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/boxingConverter.h b/ets2panda/checker/ets/boxingConverter.h
index ed53d9db60b61f8f91fd08fcf341cf66b6829ff0..13ccc675ed3e559e3ff847198cf6f0c390af7409 100644
--- a/ets2panda/checker/ets/boxingConverter.h
+++ b/ets2panda/checker/ets/boxingConverter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/castingContext.cpp b/ets2panda/checker/ets/castingContext.cpp
index a9c5418494b24cb50f003d9d2aac530f8846d277..dbb7ea4b52a34c00d0dd8f042b7425905f696374 100644
--- a/ets2panda/checker/ets/castingContext.cpp
+++ b/ets2panda/checker/ets/castingContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/castingContext.h b/ets2panda/checker/ets/castingContext.h
index c5ff8257b868f3157b08d7ca98d30663bac0f43a..db6ef1442bf22ff29bef4842aba7b1dc674f1df0 100644
--- a/ets2panda/checker/ets/castingContext.h
+++ b/ets2panda/checker/ets/castingContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/conversion.cpp b/ets2panda/checker/ets/conversion.cpp
index 2c9ac1fa405c06cd9fe914f085cb0cd7d1707f42..83d5c7ec9e8fc558b969303b32602d17def0809a 100644
--- a/ets2panda/checker/ets/conversion.cpp
+++ b/ets2panda/checker/ets/conversion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/conversion.h b/ets2panda/checker/ets/conversion.h
index 2b94bfbfc6cfd3526ee1eb240955c6a3da5b3c74..f796162a35d514d53556f5df8d62687e8ab2a2a1 100644
--- a/ets2panda/checker/ets/conversion.h
+++ b/ets2panda/checker/ets/conversion.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/dynamic.cpp b/ets2panda/checker/ets/dynamic.cpp
index 69c9b8526815b156243b20ee8c9d8dcffb606b32..eec5ae919e5c8f5abc7220328f38ac71f2e11ed4 100644
--- a/ets2panda/checker/ets/dynamic.cpp
+++ b/ets2panda/checker/ets/dynamic.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/enum.cpp b/ets2panda/checker/ets/enum.cpp
index 30e069a25bb02ecb546e7475f312eb5033988b05..fa148b719bde54c9467b598d78a3f470d352a4ae 100644
--- a/ets2panda/checker/ets/enum.cpp
+++ b/ets2panda/checker/ets/enum.cpp
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http: //www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/ets2panda/checker/ets/function_helpers.h b/ets2panda/checker/ets/function_helpers.h
index 0ac3267d1a87ce97316ba904af40eab751985e9b..c112c116f7f81819b5fe4e0e0577fe4ea70f5e10 100644
--- a/ets2panda/checker/ets/function_helpers.h
+++ b/ets2panda/checker/ets/function_helpers.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/narrowingConverter.cpp b/ets2panda/checker/ets/narrowingConverter.cpp
index 2ad286385304b5a4e2f220bf3e11148535f92805..ad1dabf223a6bd3aaf9db95a9bafca5f8ffaf0eb 100644
--- a/ets2panda/checker/ets/narrowingConverter.cpp
+++ b/ets2panda/checker/ets/narrowingConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/narrowingConverter.h b/ets2panda/checker/ets/narrowingConverter.h
index 7c2edddfd6bf2838881a0b41a69c6ebf3d139875..89686fb09c830341df50a579ae435f6084c7728e 100644
--- a/ets2panda/checker/ets/narrowingConverter.h
+++ b/ets2panda/checker/ets/narrowingConverter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/narrowingWideningConverter.cpp b/ets2panda/checker/ets/narrowingWideningConverter.cpp
index 8a037b0301a3df3a550d2082816e5cbaf414ca68..7a628733a29a6dbd78a2c5a1f2a55b143f45a7ca 100644
--- a/ets2panda/checker/ets/narrowingWideningConverter.cpp
+++ b/ets2panda/checker/ets/narrowingWideningConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/narrowingWideningConverter.h b/ets2panda/checker/ets/narrowingWideningConverter.h
index c6e16aceabf884a57cccfec89e3875ebfd80679a..2716c8303f5fdf06b15bd1530a60afd3dd5481ff 100644
--- a/ets2panda/checker/ets/narrowingWideningConverter.h
+++ b/ets2panda/checker/ets/narrowingWideningConverter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/primitiveWrappers.cpp b/ets2panda/checker/ets/primitiveWrappers.cpp
index 4f9c6b68b015d750b861e429566be3eba68e5c57..046f40ced0154430a83a6f9314efd7c4ac8e8107 100644
--- a/ets2panda/checker/ets/primitiveWrappers.cpp
+++ b/ets2panda/checker/ets/primitiveWrappers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/typeConverter.cpp b/ets2panda/checker/ets/typeConverter.cpp
index b648c168178fc42c6c6588bbc9cc330253207501..c64e03da027f869a46df44c84b1eecacb10b26d0 100644
--- a/ets2panda/checker/ets/typeConverter.cpp
+++ b/ets2panda/checker/ets/typeConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/typeConverter.h b/ets2panda/checker/ets/typeConverter.h
index 0c3289a85f4fbe5bd8a499482dbad4cb6aa8bc8b..d0b0060f7a71cf188dc7a28933012f2ed7ed4a0a 100644
--- a/ets2panda/checker/ets/typeConverter.h
+++ b/ets2panda/checker/ets/typeConverter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/typeRelationContext.cpp b/ets2panda/checker/ets/typeRelationContext.cpp
index 2f56a4c41cca4cfd0fa88b458ea2f3c39eefd5a1..ee23d08854063b5e52316957947e01388f42bee9 100644
--- a/ets2panda/checker/ets/typeRelationContext.cpp
+++ b/ets2panda/checker/ets/typeRelationContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/typeRelationContext.h b/ets2panda/checker/ets/typeRelationContext.h
index 2cedf02fa1f8248e5bfd0bc5653d5b73eef32d6a..bd08c6587ad565e45c4c9e8a11f57ed6defeb724 100644
--- a/ets2panda/checker/ets/typeRelationContext.h
+++ b/ets2panda/checker/ets/typeRelationContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/unboxingConverter.cpp b/ets2panda/checker/ets/unboxingConverter.cpp
index 4f378a6d96f28c24ebddbda23d75367de6082336..3dba28ee9384615a46d6f3d7af22778f55e4b81c 100644
--- a/ets2panda/checker/ets/unboxingConverter.cpp
+++ b/ets2panda/checker/ets/unboxingConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/unboxingConverter.h b/ets2panda/checker/ets/unboxingConverter.h
index f18fe678dd8f6e2f86184bd44a58111a62095c93..540f22fb9d935aa3f4177f86235cbda5a9451527 100644
--- a/ets2panda/checker/ets/unboxingConverter.h
+++ b/ets2panda/checker/ets/unboxingConverter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/wideningConverter.cpp b/ets2panda/checker/ets/wideningConverter.cpp
index ac7ef8579e6c7cb50abf7098a57a6367c7189fa0..6d6e681d50ecaeaf0663dfbf6d3b63690b6890d0 100644
--- a/ets2panda/checker/ets/wideningConverter.cpp
+++ b/ets2panda/checker/ets/wideningConverter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/ets/wideningConverter.h b/ets2panda/checker/ets/wideningConverter.h
index aa254771ce567648ff67417293080655d0cab855..12dddcecdc90ad217c82794c031f44ed7e991e19 100644
--- a/ets2panda/checker/ets/wideningConverter.h
+++ b/ets2panda/checker/ets/wideningConverter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/resolveResult.h b/ets2panda/checker/resolveResult.h
index 84844d29197a87fc5b49fc46a304115fc0a8d10c..8d9470c5fdcbf88bc39d3807d2331b56188b497b 100644
--- a/ets2panda/checker/resolveResult.h
+++ b/ets2panda/checker/resolveResult.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/byteType.cpp b/ets2panda/checker/types/ets/byteType.cpp
index d662c6e0a02a89c415f3a43be75e85cac2257612..05f77b0b624238300a5f04d0dc3b12d498249ac2 100644
--- a/ets2panda/checker/types/ets/byteType.cpp
+++ b/ets2panda/checker/types/ets/byteType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/byteType.h b/ets2panda/checker/types/ets/byteType.h
index 88cfce4304cba440c42cbc6ef00dad6a3464618e..5ba92a4d7666fe6fa01d2797072fafba0c3c47c7 100644
--- a/ets2panda/checker/types/ets/byteType.h
+++ b/ets2panda/checker/types/ets/byteType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/charType.cpp b/ets2panda/checker/types/ets/charType.cpp
index d12017b54aac6204de6efdc4c2a2276e92249a7f..be7d27609fca651e38bb2b552aa5d0a7f1c79754 100644
--- a/ets2panda/checker/types/ets/charType.cpp
+++ b/ets2panda/checker/types/ets/charType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/charType.h b/ets2panda/checker/types/ets/charType.h
index 12878a3aff5b12c17c87f6079987bb7bef3df35f..a1ea57fef90f42d9035b65862594e135d4edbb59 100644
--- a/ets2panda/checker/types/ets/charType.h
+++ b/ets2panda/checker/types/ets/charType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/doubleType.cpp b/ets2panda/checker/types/ets/doubleType.cpp
index 0b1bf0f592fa85b9095e8d1ca9acd4ce42a0b0d2..4f92ba92184e574df1be53e9d37d64adebd01cda 100644
--- a/ets2panda/checker/types/ets/doubleType.cpp
+++ b/ets2panda/checker/types/ets/doubleType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/doubleType.h b/ets2panda/checker/types/ets/doubleType.h
index 2377f4244318a3017525e95355e0a5bc60b2d5cf..80be747c392543f0884cfc3e1ef20aa278eda565 100644
--- a/ets2panda/checker/types/ets/doubleType.h
+++ b/ets2panda/checker/types/ets/doubleType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsArrayType.cpp b/ets2panda/checker/types/ets/etsArrayType.cpp
index e6ea36913ce4b12478652d57ed0810532b5d145d..0dd1a3f2b358b91b39559adf51e7ae2fe07ce569 100644
--- a/ets2panda/checker/types/ets/etsArrayType.cpp
+++ b/ets2panda/checker/types/ets/etsArrayType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsArrayType.h b/ets2panda/checker/types/ets/etsArrayType.h
index f1cb2f1bada6ea7ea76e0e32896c38c015cdb99d..87017417a01bfc95e1f868c0c1b22413042c4d67 100644
--- a/ets2panda/checker/types/ets/etsArrayType.h
+++ b/ets2panda/checker/types/ets/etsArrayType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsAsyncFuncReturnType.cpp b/ets2panda/checker/types/ets/etsAsyncFuncReturnType.cpp
index d949edc1788949a1093d41aabc1e01cfec3d8bc5..950477c3f155fd61c52025c03cc22aac68fd9943 100644
--- a/ets2panda/checker/types/ets/etsAsyncFuncReturnType.cpp
+++ b/ets2panda/checker/types/ets/etsAsyncFuncReturnType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsAsyncFuncReturnType.h b/ets2panda/checker/types/ets/etsAsyncFuncReturnType.h
index c5ed7d523b16deda70cb9903fdf505124fda0114..fc3fb0df7f9102e1be6c9971c4cb2cec39c33dbe 100644
--- a/ets2panda/checker/types/ets/etsAsyncFuncReturnType.h
+++ b/ets2panda/checker/types/ets/etsAsyncFuncReturnType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsBooleanType.cpp b/ets2panda/checker/types/ets/etsBooleanType.cpp
index a6d5dd49daeb8106873f4de82d4761031e302f4f..aaf1dac4e6e820dea9de9919e8ccde00b06622b2 100644
--- a/ets2panda/checker/types/ets/etsBooleanType.cpp
+++ b/ets2panda/checker/types/ets/etsBooleanType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsBooleanType.h b/ets2panda/checker/types/ets/etsBooleanType.h
index c48b766bc21b4297c6f5d34816d91c3ba508e9ff..3734e40a664525ec1f54c7038b3757772c0c47e4 100644
--- a/ets2panda/checker/types/ets/etsBooleanType.h
+++ b/ets2panda/checker/types/ets/etsBooleanType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsDynamicFunctionType.h b/ets2panda/checker/types/ets/etsDynamicFunctionType.h
index 638601655721afd2b513c4bbc64a2071e3536bb2..9d437688b27ec6f1ed72b357e35978558014fb22 100644
--- a/ets2panda/checker/types/ets/etsDynamicFunctionType.h
+++ b/ets2panda/checker/types/ets/etsDynamicFunctionType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsDynamicType.cpp b/ets2panda/checker/types/ets/etsDynamicType.cpp
index 4c07a3bd086ca84055f346038c60f27227132a1a..cbe881350a21ff27f0d91cf7c9b22db5d2235c79 100644
--- a/ets2panda/checker/types/ets/etsDynamicType.cpp
+++ b/ets2panda/checker/types/ets/etsDynamicType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsDynamicType.h b/ets2panda/checker/types/ets/etsDynamicType.h
index 66169a10ef49aa88aacb760f6d00564a29d10215..3e2475ca419d1038a791357b6769856a65916c3b 100644
--- a/ets2panda/checker/types/ets/etsDynamicType.h
+++ b/ets2panda/checker/types/ets/etsDynamicType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsEnumType.cpp b/ets2panda/checker/types/ets/etsEnumType.cpp
index f102cd217775d13d7eb6e510f434cecc246ffea7..2288d0044d2939305e1a6cea20782a03e6dc5f7e 100644
--- a/ets2panda/checker/types/ets/etsEnumType.cpp
+++ b/ets2panda/checker/types/ets/etsEnumType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsEnumType.h b/ets2panda/checker/types/ets/etsEnumType.h
index b926a304d93ed005f597326366ae5071388a12ba..fb9cc0debb0d67eb05482c3e70aaa8cb8b3a9d14 100644
--- a/ets2panda/checker/types/ets/etsEnumType.h
+++ b/ets2panda/checker/types/ets/etsEnumType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsExtensionFuncHelperType.cpp b/ets2panda/checker/types/ets/etsExtensionFuncHelperType.cpp
index e24ee3e6deaffbca233a26dc239cf7301680965b..6757b96f85ef7373a0a988848552decdb1628b0e 100644
--- a/ets2panda/checker/types/ets/etsExtensionFuncHelperType.cpp
+++ b/ets2panda/checker/types/ets/etsExtensionFuncHelperType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsExtensionFuncHelperType.h b/ets2panda/checker/types/ets/etsExtensionFuncHelperType.h
index d57bf7944004bb9cb300658be9ad682e2893d27f..735a86e164bb5f482667304f37569036055eb543 100644
--- a/ets2panda/checker/types/ets/etsExtensionFuncHelperType.h
+++ b/ets2panda/checker/types/ets/etsExtensionFuncHelperType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsFunctionType.cpp b/ets2panda/checker/types/ets/etsFunctionType.cpp
index 6e34f6ea2576605bab9d8f44a2b40adaa93c1617..b67c53ca99d7394fc16a3659e7ed87f311f20174 100644
--- a/ets2panda/checker/types/ets/etsFunctionType.cpp
+++ b/ets2panda/checker/types/ets/etsFunctionType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsFunctionType.h b/ets2panda/checker/types/ets/etsFunctionType.h
index 815055f2e089ee00af9d38af309b16f90c0302a9..012c71251b13b3f46d34a13d7475d1613f580205 100644
--- a/ets2panda/checker/types/ets/etsFunctionType.h
+++ b/ets2panda/checker/types/ets/etsFunctionType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsObjectType.cpp b/ets2panda/checker/types/ets/etsObjectType.cpp
index 9ce2ac03017becbc56a88267ed339c1290e1a998..6678a6f2719b0b87ef8c9b69f01035ae7d891b64 100644
--- a/ets2panda/checker/types/ets/etsObjectType.cpp
+++ b/ets2panda/checker/types/ets/etsObjectType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsObjectType.h b/ets2panda/checker/types/ets/etsObjectType.h
index 8a5d052c309142fbfc9c3b2693a25ce5a0318305..2f9f726d595d40234cb791f14c0682603499b2e1 100644
--- a/ets2panda/checker/types/ets/etsObjectType.h
+++ b/ets2panda/checker/types/ets/etsObjectType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsStringType.cpp b/ets2panda/checker/types/ets/etsStringType.cpp
index 9f0a1aacae6e0aa087e793172bdc1c63de9a7f13..0528fd46ff78fe7756d9c8dec9723658e0e61274 100644
--- a/ets2panda/checker/types/ets/etsStringType.cpp
+++ b/ets2panda/checker/types/ets/etsStringType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsStringType.h b/ets2panda/checker/types/ets/etsStringType.h
index 5ee82f4377effcd6d811eeb0aa3cce56ed0363af..acf4e3e4b99fb37e9b756fe5e353493790a78bff 100644
--- a/ets2panda/checker/types/ets/etsStringType.h
+++ b/ets2panda/checker/types/ets/etsStringType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsTypeParameter.cpp b/ets2panda/checker/types/ets/etsTypeParameter.cpp
index 3c4c2ced73fae5c68ddfa757437ccf2b610b1c40..43edd66d0c19a7774de1c0012c5d6cff3fb37b04 100644
--- a/ets2panda/checker/types/ets/etsTypeParameter.cpp
+++ b/ets2panda/checker/types/ets/etsTypeParameter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsTypeParameter.h b/ets2panda/checker/types/ets/etsTypeParameter.h
index dcdeb5fae1874f7492152aabcb6bf32e9a231a83..1ef6df6e0e761c246f4819086cf0e07374145e53 100644
--- a/ets2panda/checker/types/ets/etsTypeParameter.h
+++ b/ets2panda/checker/types/ets/etsTypeParameter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsUnionType.cpp b/ets2panda/checker/types/ets/etsUnionType.cpp
index b0addc81fd54c38f60c346cb3057321476d39d3c..869bce16feba454a3273f221c840d2f19b373899 100644
--- a/ets2panda/checker/types/ets/etsUnionType.cpp
+++ b/ets2panda/checker/types/ets/etsUnionType.cpp
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsUnionType.h b/ets2panda/checker/types/ets/etsUnionType.h
index 26760592334537e7e0d073ad612bcb6f01181ca7..66cf14228c95472fa675ef1a0c5a5aab50668168 100644
--- a/ets2panda/checker/types/ets/etsUnionType.h
+++ b/ets2panda/checker/types/ets/etsUnionType.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsVoidType.cpp b/ets2panda/checker/types/ets/etsVoidType.cpp
index b25e85b491fe59a62387bb69ae0f7872121024c7..0e6c20f848c1de22df5c61bbdbd6c02262b8d7b3 100644
--- a/ets2panda/checker/types/ets/etsVoidType.cpp
+++ b/ets2panda/checker/types/ets/etsVoidType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/etsVoidType.h b/ets2panda/checker/types/ets/etsVoidType.h
index 684a85410571db40af3911de69a8da1df46e8ecc..877134f5e6d37cdd91b7ac1f6ae88af2a1f758a3 100644
--- a/ets2panda/checker/types/ets/etsVoidType.h
+++ b/ets2panda/checker/types/ets/etsVoidType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/floatType.cpp b/ets2panda/checker/types/ets/floatType.cpp
index 7276907fc2f70f3aa7b3342aa2e4c73c26534d45..56070a4330c045ece25507fca4447afbaa94284f 100644
--- a/ets2panda/checker/types/ets/floatType.cpp
+++ b/ets2panda/checker/types/ets/floatType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/floatType.h b/ets2panda/checker/types/ets/floatType.h
index 055fb37fd521a77228d467ac556960290b9b1ba5..9f14f58f427ac56b5a13df743290cff86d983659 100644
--- a/ets2panda/checker/types/ets/floatType.h
+++ b/ets2panda/checker/types/ets/floatType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/intType.cpp b/ets2panda/checker/types/ets/intType.cpp
index 15f93bcbb3bf9c40a9620e572f4facd9bb4bd533..165e197f928009a57c506867c853d99dcf4f279d 100644
--- a/ets2panda/checker/types/ets/intType.cpp
+++ b/ets2panda/checker/types/ets/intType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/intType.h b/ets2panda/checker/types/ets/intType.h
index fe0e02ee3b2ea4b648e7b1d3c0c408822ee303d7..a7d60cc9213fd22e60b4cf9eda5f10a6e68a79b0 100644
--- a/ets2panda/checker/types/ets/intType.h
+++ b/ets2panda/checker/types/ets/intType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/longType.cpp b/ets2panda/checker/types/ets/longType.cpp
index 565a22bc1542d7cd2db7a57b46f3a0dcb1cb0ab4..6b0fdba23e8ce0cdadc01d148cd1f5e6ab43335b 100644
--- a/ets2panda/checker/types/ets/longType.cpp
+++ b/ets2panda/checker/types/ets/longType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/longType.h b/ets2panda/checker/types/ets/longType.h
index 8a3546718da96d3a8f9fe6948f190978a271249f..9e6bc6b9ef29b145cfd6c1e55d71f2f205254278 100644
--- a/ets2panda/checker/types/ets/longType.h
+++ b/ets2panda/checker/types/ets/longType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/shortType.cpp b/ets2panda/checker/types/ets/shortType.cpp
index 69f2d0014cc12d534ce2d23a5f1efecd662e3f4a..1812690e6cb7020577aefd41136c7d592ae67eb0 100644
--- a/ets2panda/checker/types/ets/shortType.cpp
+++ b/ets2panda/checker/types/ets/shortType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/shortType.h b/ets2panda/checker/types/ets/shortType.h
index b5ab753ebc5c3388ea594ac2dd7bbf1cf4f8597b..3197721beec1a5fbada2f39d996b51a516cf9a2b 100644
--- a/ets2panda/checker/types/ets/shortType.h
+++ b/ets2panda/checker/types/ets/shortType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/wildcardType.cpp b/ets2panda/checker/types/ets/wildcardType.cpp
index 1b71b48b8588fa79b2caccde795108d6cd66f537..81a800f23eb9f946f441873dcbed85d54a46f467 100644
--- a/ets2panda/checker/types/ets/wildcardType.cpp
+++ b/ets2panda/checker/types/ets/wildcardType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/checker/types/ets/wildcardType.h b/ets2panda/checker/types/ets/wildcardType.h
index 4c627d523e5cdf45173809a011dd8f63b486513a..18ab76272248f45c6a2955cd024e7069d9fe3158 100644
--- a/ets2panda/checker/types/ets/wildcardType.h
+++ b/ets2panda/checker/types/ets/wildcardType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/catchTable.cpp b/ets2panda/compiler/base/catchTable.cpp
index 598f8482c03209e0e4eb37898f15db5597b298c5..cc77325a7826175e904359c5fa84525de51de7be 100644
--- a/ets2panda/compiler/base/catchTable.cpp
+++ b/ets2panda/compiler/base/catchTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/catchTable.h b/ets2panda/compiler/base/catchTable.h
index 7b1e86d2fc497374e99edd084bc36403b26c627f..ae1b68064fd9329a8ae6bfb532c799fd3e5cef12 100644
--- a/ets2panda/compiler/base/catchTable.h
+++ b/ets2panda/compiler/base/catchTable.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/condition.cpp b/ets2panda/compiler/base/condition.cpp
index dbabdb9ba8406d8114ecc5e59d8ebd13e1287ea1..9f9bcb290a162b5e3ddb19849ef09572cac14b4c 100644
--- a/ets2panda/compiler/base/condition.cpp
+++ b/ets2panda/compiler/base/condition.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/condition.h b/ets2panda/compiler/base/condition.h
index 165b37cf8d2e7caf6470ea6021958b0eab24a697..11ed9e8670ccb054d15c950f11338de275f11aa9 100644
--- a/ets2panda/compiler/base/condition.h
+++ b/ets2panda/compiler/base/condition.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/destructuring.h b/ets2panda/compiler/base/destructuring.h
index 358640c0fc932a29d75dfee0b7e5d1162509e666..3d9f16cb25571269a6219c3bb23847736253bb12 100644
--- a/ets2panda/compiler/base/destructuring.h
+++ b/ets2panda/compiler/base/destructuring.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/iterators.cpp b/ets2panda/compiler/base/iterators.cpp
index 9eb761c488596cb66dd410cf31c0a25159d1c75c..01e8bb06fe7818d8d8cad0c55485a78c0b2c5e6f 100644
--- a/ets2panda/compiler/base/iterators.cpp
+++ b/ets2panda/compiler/base/iterators.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/iterators.h b/ets2panda/compiler/base/iterators.h
index 5607b9142a82d61cf8138ee982a052e89f78bff6..6d3192d61e5218fa77eb52e2192202a623a9e497 100644
--- a/ets2panda/compiler/base/iterators.h
+++ b/ets2panda/compiler/base/iterators.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/literals.cpp b/ets2panda/compiler/base/literals.cpp
index 660f3c814692b5f00552c3965023019996dbaa33..a7692148d21c453a36da3498b750183ba7af7da8 100644
--- a/ets2panda/compiler/base/literals.cpp
+++ b/ets2panda/compiler/base/literals.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/literals.h b/ets2panda/compiler/base/literals.h
index debb3e00d7fcaa26fad21e531a50a250070707a6..45c1cd5143608fb4a1c339b7ab6f9920c80bb4d6 100644
--- a/ets2panda/compiler/base/literals.h
+++ b/ets2panda/compiler/base/literals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/lreference.cpp b/ets2panda/compiler/base/lreference.cpp
index 0c80103e64676bebb1b0e2fa5882a1ad78ea0966..a3676f6470f76ca97ed05134b47e852c79f64423 100644
--- a/ets2panda/compiler/base/lreference.cpp
+++ b/ets2panda/compiler/base/lreference.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/base/lreference.h b/ets2panda/compiler/base/lreference.h
index cae126baabc34f933049df266ff741dc66c43453..fb06802d058046be7e5fbea74b0813e1d437f936 100644
--- a/ets2panda/compiler/base/lreference.h
+++ b/ets2panda/compiler/base/lreference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/ASTCompiler.h b/ets2panda/compiler/core/ASTCompiler.h
index d6fa1d171c83dc98930b52a24d5dd9753b2a1dec..91f1eb2fc0f883e73730012b1cde2e715ddb1cf3 100644
--- a/ets2panda/compiler/core/ASTCompiler.h
+++ b/ets2panda/compiler/core/ASTCompiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/ASTVerifier.cpp b/ets2panda/compiler/core/ASTVerifier.cpp
index 9f9b376f1bf28e456a0aeef0bbcabd1b81dc4349..fce72cee39540ca260c2bfe99921bce78fc74bef 100644
--- a/ets2panda/compiler/core/ASTVerifier.cpp
+++ b/ets2panda/compiler/core/ASTVerifier.cpp
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/ASTVerifier.h b/ets2panda/compiler/core/ASTVerifier.h
index d9bdba1180982ab20a5050b1b263dfe8f9db2cda..d5cbb7f2d5923998392a6a02d4cc482d1424d013 100644
--- a/ets2panda/compiler/core/ASTVerifier.h
+++ b/ets2panda/compiler/core/ASTVerifier.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/ETSCompiler.cpp b/ets2panda/compiler/core/ETSCompiler.cpp
index 4770e12ab3c3b6adab796ada779aa83caaa6a554..6ad0a7f3e93368aeeca4980c6af8369c11a9f0f0 100644
--- a/ets2panda/compiler/core/ETSCompiler.cpp
+++ b/ets2panda/compiler/core/ETSCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/ETSCompiler.h b/ets2panda/compiler/core/ETSCompiler.h
index bbd98de6b3953f14afa6c4796deabf8930fa8225..df72ed1699f577a79948cc5b408b0dd01789cb00 100644
--- a/ets2panda/compiler/core/ETSCompiler.h
+++ b/ets2panda/compiler/core/ETSCompiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/ETSGen.cpp b/ets2panda/compiler/core/ETSGen.cpp
index 49bef2b5e863afcea98eedff9a7f3111d67986c5..c2e7e93fef55836888f10b1c49fa9e5863dc078d 100644
--- a/ets2panda/compiler/core/ETSGen.cpp
+++ b/ets2panda/compiler/core/ETSGen.cpp
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/ets2panda/compiler/core/ETSGen.h b/ets2panda/compiler/core/ETSGen.h
index 77e6c004b0ad16b67b9bae23a7c36ac9496cec4f..6f97fa47eceb8075c1137908231bd76f9dc4f1c6 100644
--- a/ets2panda/compiler/core/ETSGen.h
+++ b/ets2panda/compiler/core/ETSGen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -883,15 +883,15 @@ private:
         }
     }
 // NOLINTBEGIN(cppcoreguidelines-macro-usage, readability-container-size-empty)
-#define COMPILE_ARG(idx)                                                                                  \
-    ASSERT(idx < arguments.size());                                                                       \
-    ASSERT(idx < signature->Params().size() || signature->RestVar() != nullptr);                          \
-    auto *paramType##idx = Checker()->MaybeBoxedType(                                                     \
-        idx < signature->Params().size() ? signature->Params()[idx] : signature->RestVar(), Allocator()); \
-    auto ttctx##idx = TargetTypeContext(this, paramType##idx);                                            \
-    arguments[idx]->Compile(this);                                                                        \
-    VReg arg##idx = AllocReg();                                                                           \
-    ApplyConversion(arguments[idx], nullptr);                                                             \
+#define COMPILE_ARG(idx)                                                                                    \
+    ASSERT((idx) < arguments.size());                                                                       \
+    ASSERT((idx) < signature->Params().size() || signature->RestVar() != nullptr);                          \
+    auto *paramType##idx = Checker()->MaybeBoxedType(                                                       \
+        idx < signature->Params().size() ? signature->Params()[(idx)] : signature->RestVar(), Allocator()); \
+    auto ttctx##idx = TargetTypeContext(this, paramType##idx);                                              \
+    arguments[idx]->Compile(this);                                                                          \
+    VReg arg##idx = AllocReg();                                                                             \
+    ApplyConversion(arguments[idx], nullptr);                                                               \
     ApplyConversionAndStoreAccumulator(arguments[idx], arg##idx, paramType##idx);
 
     template <typename Short, typename General, typename Range>
@@ -1004,8 +1004,8 @@ private:
 #undef COMPILE_ARG
 
 #define COMPILE_ARG(idx)                                                                                   \
-    ASSERT(idx < arguments.size());                                                                        \
-    ASSERT(idx + 2U < signature->Params().size() || signature->RestVar() != nullptr);                      \
+    ASSERT((idx) < arguments.size());                                                                      \
+    ASSERT((idx) + 2U < signature->Params().size() || signature->RestVar() != nullptr);                    \
     auto *paramType##idx = idx + 2U < signature->Params().size() ? signature->Params()[idx + 2U]->TsType() \
                                                                  : signature->RestVar()->TsType();         \
     auto ttctx##idx = TargetTypeContext(this, paramType##idx);                                             \
diff --git a/ets2panda/compiler/core/ETSemitter.cpp b/ets2panda/compiler/core/ETSemitter.cpp
index a8589bcf512267dc099fad9d38cf86607d835d47..8f3170bad37f7b1b515da10f3dd2fdcf3b771753 100644
--- a/ets2panda/compiler/core/ETSemitter.cpp
+++ b/ets2panda/compiler/core/ETSemitter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/ETSemitter.h b/ets2panda/compiler/core/ETSemitter.h
index af3b1748bdd24d211d177d855155f3b079656198..5adf0423e9341c1e0b66f966db53aab76a0c6add 100644
--- a/ets2panda/compiler/core/ETSemitter.h
+++ b/ets2panda/compiler/core/ETSemitter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/ETSfunction.cpp b/ets2panda/compiler/core/ETSfunction.cpp
index e25e0915d014772397df95e050bd789622477f85..318eddb3024c6e5a86253081acc922284019a461 100644
--- a/ets2panda/compiler/core/ETSfunction.cpp
+++ b/ets2panda/compiler/core/ETSfunction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/ETSfunction.h b/ets2panda/compiler/core/ETSfunction.h
index 1258168cb4871f55cc390285850b2d649409cb44..ecfc2514bc656a6071417f674c7723871391232d 100644
--- a/ets2panda/compiler/core/ETSfunction.h
+++ b/ets2panda/compiler/core/ETSfunction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/JSCompiler.cpp b/ets2panda/compiler/core/JSCompiler.cpp
index 23fc28f983e779a35e8f1d8cd8a810190aa0c3b6..a65f34b43f75aeb755fc87cc90ba4a6c6f589c0d 100644
--- a/ets2panda/compiler/core/JSCompiler.cpp
+++ b/ets2panda/compiler/core/JSCompiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/JSCompiler.h b/ets2panda/compiler/core/JSCompiler.h
index 081389eca7472f88d8548c520ee6b81fd7393e9d..9d506416504cc8298c4bffcde4682922cd26ab9c 100644
--- a/ets2panda/compiler/core/JSCompiler.h
+++ b/ets2panda/compiler/core/JSCompiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/JSemitter.cpp b/ets2panda/compiler/core/JSemitter.cpp
index bb0367ba175b18d2275f298261c1c8123ba8606e..39ab410dbdce2b3bf10dc65588c5ab95036e2241 100644
--- a/ets2panda/compiler/core/JSemitter.cpp
+++ b/ets2panda/compiler/core/JSemitter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/JSemitter.h b/ets2panda/compiler/core/JSemitter.h
index 2a38cb6b1fd47b31000cb356a2a94c6951afdabb..f220f2346c2eda930a8990987cd0e00519f455f6 100644
--- a/ets2panda/compiler/core/JSemitter.h
+++ b/ets2panda/compiler/core/JSemitter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/codeGen.cpp b/ets2panda/compiler/core/codeGen.cpp
index a94baabfd62a662f9035323e12f9948918d76ab4..85e0e3b8fe50ad040661ead47ab2dbbd27930f34 100644
--- a/ets2panda/compiler/core/codeGen.cpp
+++ b/ets2panda/compiler/core/codeGen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/codeGen.h b/ets2panda/compiler/core/codeGen.h
index 07a7c9164c3bb9a5c2b145ae938866b64f3d6633..e06a982cad260779b94b10d71f4f1b60e4b24c2d 100644
--- a/ets2panda/compiler/core/codeGen.h
+++ b/ets2panda/compiler/core/codeGen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/compileJob.cpp b/ets2panda/compiler/core/compileJob.cpp
index c2cc5c880fc14103e19d0847e98c05224ec1c0df..923d1915b5e8f80ab9a41fbaf3e4acfd89387685 100644
--- a/ets2panda/compiler/core/compileJob.cpp
+++ b/ets2panda/compiler/core/compileJob.cpp
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/ets2panda/compiler/core/compileJob.h b/ets2panda/compiler/core/compileJob.h
index 9c6175ba3c89f4a9c3800e06fba3355da9f0163d..528f5871a0c200b9cb4d5d8b67d97069ae3ab016 100644
--- a/ets2panda/compiler/core/compileJob.h
+++ b/ets2panda/compiler/core/compileJob.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/compileQueue.cpp b/ets2panda/compiler/core/compileQueue.cpp
index ea49298b98fd41536a51a0195d0eb29efa0e09e4..ee8fc3b139adf23bbb30acc597200638ca8af5ea 100644
--- a/ets2panda/compiler/core/compileQueue.cpp
+++ b/ets2panda/compiler/core/compileQueue.cpp
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/ets2panda/compiler/core/compileQueue.h b/ets2panda/compiler/core/compileQueue.h
index 95b16d89e284a7dfdb34c7533d28c2eecbde0ce7..f347591806ef975108951940bfd19f57d31c0aea 100644
--- a/ets2panda/compiler/core/compileQueue.h
+++ b/ets2panda/compiler/core/compileQueue.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/compilerContext.cpp b/ets2panda/compiler/core/compilerContext.cpp
index 3e712f56a7067d35349a9e974dc491c58ccd64ee..ec8b0ccac555930e2ad281e9f17a996494319b59 100644
--- a/ets2panda/compiler/core/compilerContext.cpp
+++ b/ets2panda/compiler/core/compilerContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/compilerContext.h b/ets2panda/compiler/core/compilerContext.h
index 592ad18ab80319a99add51197280cdee2d3647e4..420a9fb18bc3e2407b8a89b958dd07da2dfce6eb 100644
--- a/ets2panda/compiler/core/compilerContext.h
+++ b/ets2panda/compiler/core/compilerContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/envScope.cpp b/ets2panda/compiler/core/envScope.cpp
index 606f28c297f5936e2955ff7d289519e43f56e7fb..62442c5ba56016e95c746b43230e7e1877f512ac 100644
--- a/ets2panda/compiler/core/envScope.cpp
+++ b/ets2panda/compiler/core/envScope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/envScope.h b/ets2panda/compiler/core/envScope.h
index 07f34944b7a09c8daa0d372ef0bebaf1046f92d7..df49b9d242e9c14b2106bec961544503ba28c078 100644
--- a/ets2panda/compiler/core/envScope.h
+++ b/ets2panda/compiler/core/envScope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/pandagen.cpp b/ets2panda/compiler/core/pandagen.cpp
index b34886783bd654fb38310d7ca26a0e74bc805b39..b3107df9427eb9f3820896d849097afc61351d37 100644
--- a/ets2panda/compiler/core/pandagen.cpp
+++ b/ets2panda/compiler/core/pandagen.cpp
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/ets2panda/compiler/core/pandagen.h b/ets2panda/compiler/core/pandagen.h
index 037e6fa4490e8354a0c56bb93f2f4937a74fb174..fd2a5c8ae934d0552035fbe4007d071d30b25252 100644
--- a/ets2panda/compiler/core/pandagen.h
+++ b/ets2panda/compiler/core/pandagen.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/programElement.cpp b/ets2panda/compiler/core/programElement.cpp
index 07d847d8e07c6080bce65f2df1f9940f624a2052..305ef3b5bdb6e9027d3dd281d4e7687abef6bf75 100644
--- a/ets2panda/compiler/core/programElement.cpp
+++ b/ets2panda/compiler/core/programElement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/programElement.h b/ets2panda/compiler/core/programElement.h
index 998754ccf8e039cea6957c0b6b803265865bf82b..c1f866cbb4960c5162346139eacdd0de69edc543 100644
--- a/ets2panda/compiler/core/programElement.h
+++ b/ets2panda/compiler/core/programElement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/regAllocator.cpp b/ets2panda/compiler/core/regAllocator.cpp
index 07c2b353e266ed5c474cecefcb866c52e5519f3c..2377a8e5a35d637de4ba272dcec3e4705415267a 100644
--- a/ets2panda/compiler/core/regAllocator.cpp
+++ b/ets2panda/compiler/core/regAllocator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/regAllocator.h b/ets2panda/compiler/core/regAllocator.h
index 29ab23031c6570cc432709a9759409cabeaa5b8d..b0f99907afae3be520948e54baa8c35963ca4c1f 100644
--- a/ets2panda/compiler/core/regAllocator.h
+++ b/ets2panda/compiler/core/regAllocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/regScope.cpp b/ets2panda/compiler/core/regScope.cpp
index 6e535fa1cf74f3fd1ca70e7b12bb63a1b8f9195e..649d583654f51be8374f1771bc32623f77fc8cb3 100644
--- a/ets2panda/compiler/core/regScope.cpp
+++ b/ets2panda/compiler/core/regScope.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/regScope.h b/ets2panda/compiler/core/regScope.h
index 6fc8ce1137e87b8d4f764399da525d455977fb25..bac7f92e8c0b3bf7e6387da520ac76cc1d651dfe 100644
--- a/ets2panda/compiler/core/regScope.h
+++ b/ets2panda/compiler/core/regScope.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/regSpiller.cpp b/ets2panda/compiler/core/regSpiller.cpp
index 468fd8b185dc8f8bba9d4fefc95eeabd9dbc0945..aced6902453aa150f147e08ae1bec5a42fed97d7 100644
--- a/ets2panda/compiler/core/regSpiller.cpp
+++ b/ets2panda/compiler/core/regSpiller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/regSpiller.h b/ets2panda/compiler/core/regSpiller.h
index aba5b3391aad74195a6f2d59e67e92a63ce4f237..ff8c62312f1ab485846aff878b62a6fe7f06cc8d 100644
--- a/ets2panda/compiler/core/regSpiller.h
+++ b/ets2panda/compiler/core/regSpiller.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License GetReg
+ * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -10,7 +10,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitGetRegions under the License.
+ * limitations under the License.
  */
 
 #ifndef ES2PANDA_COMPILER_CORE_REG_SPILLER_H
diff --git a/ets2panda/compiler/core/targetTypeContext.cpp b/ets2panda/compiler/core/targetTypeContext.cpp
index e40e3eb554ad953fc4d2375d0e1106d4d31bd604..12fc0c5abc8fd2773decd851dc509ac4d11f571d 100644
--- a/ets2panda/compiler/core/targetTypeContext.cpp
+++ b/ets2panda/compiler/core/targetTypeContext.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/targetTypeContext.h b/ets2panda/compiler/core/targetTypeContext.h
index f476a5b3e96b1aa7129ec34ace6c96c385d6060c..e6760f22e7e2fac4b459d1124c6aff23f400212e 100644
--- a/ets2panda/compiler/core/targetTypeContext.h
+++ b/ets2panda/compiler/core/targetTypeContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/vReg.cpp b/ets2panda/compiler/core/vReg.cpp
index ccb80d7327d7c12046059624fbc37cbdccc1074a..40f87a27c0301087c60b1eeee7b7a23f99ba2563 100644
--- a/ets2panda/compiler/core/vReg.cpp
+++ b/ets2panda/compiler/core/vReg.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/core/vReg.h b/ets2panda/compiler/core/vReg.h
index cc56ed787b207feb7d37b75fb3c6c19a50bcae21..0cc9c67ba1db996f18d8f2e54bcc2ccf6ebceb33 100644
--- a/ets2panda/compiler/core/vReg.h
+++ b/ets2panda/compiler/core/vReg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/debugger/debuginfoDumper.cpp b/ets2panda/compiler/debugger/debuginfoDumper.cpp
index 1ff0a7d9e79ab07205acb5315a7a8a4ed0bef3c6..16b79913d4e806c44566b00c521bc02bd3e5010b 100644
--- a/ets2panda/compiler/debugger/debuginfoDumper.cpp
+++ b/ets2panda/compiler/debugger/debuginfoDumper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/debugger/debuginfoDumper.h b/ets2panda/compiler/debugger/debuginfoDumper.h
index b0c581aaca82e911e4a84db54defe8ed29efe36e..3f5f0ade92bdf0b4ef6371ff8819e33fe83a70a6 100644
--- a/ets2panda/compiler/debugger/debuginfoDumper.h
+++ b/ets2panda/compiler/debugger/debuginfoDumper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/function/asyncFunctionBuilder.cpp b/ets2panda/compiler/function/asyncFunctionBuilder.cpp
index 5ff219746a5a3e12556be0bf4cc2fd904954f30e..2404ab976dbcee0f56352b38e245584febf60c31 100644
--- a/ets2panda/compiler/function/asyncFunctionBuilder.cpp
+++ b/ets2panda/compiler/function/asyncFunctionBuilder.cpp
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/ets2panda/compiler/function/asyncFunctionBuilder.h b/ets2panda/compiler/function/asyncFunctionBuilder.h
index 5034debb73d5311f4aba956817a975a4b9582cbe..b0e93917146db409bf7663e4f6bdab92cefe5493 100644
--- a/ets2panda/compiler/function/asyncFunctionBuilder.h
+++ b/ets2panda/compiler/function/asyncFunctionBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/function/functionBuilder.cpp b/ets2panda/compiler/function/functionBuilder.cpp
index b1ff7f4d00e75930884e54966233331ff0157bc9..f80788782e1cdc578bea78fcc3b12deeabd93d59 100644
--- a/ets2panda/compiler/function/functionBuilder.cpp
+++ b/ets2panda/compiler/function/functionBuilder.cpp
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/ets2panda/compiler/function/functionBuilder.h b/ets2panda/compiler/function/functionBuilder.h
index 3ca533d411cf540bc6ffd1febf8c57d53fe77648..bed4faa1a299e319d5f6aeb69067c72a3fb4217b 100644
--- a/ets2panda/compiler/function/functionBuilder.h
+++ b/ets2panda/compiler/function/functionBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/function/generatorFunctionBuilder.cpp b/ets2panda/compiler/function/generatorFunctionBuilder.cpp
index 95d9b8eb391d5c04b9e53578303e3c7bc0d80e5e..9cdd4baf6526bfb486433b6494fe51b861a0e0ef 100644
--- a/ets2panda/compiler/function/generatorFunctionBuilder.cpp
+++ b/ets2panda/compiler/function/generatorFunctionBuilder.cpp
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/ets2panda/compiler/function/generatorFunctionBuilder.h b/ets2panda/compiler/function/generatorFunctionBuilder.h
index d9d162b7c00ba9f9aa59241fbf46b59fd74a8793..8dd2f6f76cd3a5814b455aa7977bc4bd2e8751ae 100644
--- a/ets2panda/compiler/function/generatorFunctionBuilder.h
+++ b/ets2panda/compiler/function/generatorFunctionBuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/checkerPhase.cpp b/ets2panda/compiler/lowering/checkerPhase.cpp
index 6ecae534d154401e6e0519e5a690617fd041e7e9..a6c865ca83bb8b1ae64008e1268c4d16c70e848c 100644
--- a/ets2panda/compiler/lowering/checkerPhase.cpp
+++ b/ets2panda/compiler/lowering/checkerPhase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/checkerPhase.h b/ets2panda/compiler/lowering/checkerPhase.h
index c6c076064238f19b4bf8d5954108872538135cc3..86e0db579bd58b4821d836ed9c05005a55cc8748 100644
--- a/ets2panda/compiler/lowering/checkerPhase.h
+++ b/ets2panda/compiler/lowering/checkerPhase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/ets/generateDeclarations.cpp b/ets2panda/compiler/lowering/ets/generateDeclarations.cpp
index 3ea98c3b9be22c93ddaecd0a4edd4229d2e604f5..41393a607b8e170c7eab618830d4765d4e3e74cb 100644
--- a/ets2panda/compiler/lowering/ets/generateDeclarations.cpp
+++ b/ets2panda/compiler/lowering/ets/generateDeclarations.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/ets/generateDeclarations.h b/ets2panda/compiler/lowering/ets/generateDeclarations.h
index a59f1c6e047b794acd85a6780bb85850c006ed1d..fb7fcea3fdf721a01dffa15195528d964a803449 100644
--- a/ets2panda/compiler/lowering/ets/generateDeclarations.h
+++ b/ets2panda/compiler/lowering/ets/generateDeclarations.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/ets/opAssignment.cpp b/ets2panda/compiler/lowering/ets/opAssignment.cpp
index abdc6fc3a22df5d19a22a477e92fdb96276d9788..03ecf30834638433b677dd8cf385f568d88f2c15 100644
--- a/ets2panda/compiler/lowering/ets/opAssignment.cpp
+++ b/ets2panda/compiler/lowering/ets/opAssignment.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/ets/opAssignment.h b/ets2panda/compiler/lowering/ets/opAssignment.h
index 30d20d0fd7a996cf241a88a9954dc6fe84b477c4..b3c8dbd789b419afdf7683eabd8f93629b426661 100644
--- a/ets2panda/compiler/lowering/ets/opAssignment.h
+++ b/ets2panda/compiler/lowering/ets/opAssignment.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/ets/unionLowering.cpp b/ets2panda/compiler/lowering/ets/unionLowering.cpp
index 9aa3a1c893323672719eb9947a3f257780595b86..1f70fa278da97254a4ab38f51cf77a0182baff64 100644
--- a/ets2panda/compiler/lowering/ets/unionLowering.cpp
+++ b/ets2panda/compiler/lowering/ets/unionLowering.cpp
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/ets/unionLowering.h b/ets2panda/compiler/lowering/ets/unionLowering.h
index beddab61fefe5071cf775359b7414cfd7ea96f9c..c8a4b49a905835aa4776dd09d9d427178bf695a2 100644
--- a/ets2panda/compiler/lowering/ets/unionLowering.h
+++ b/ets2panda/compiler/lowering/ets/unionLowering.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/phase.cpp b/ets2panda/compiler/lowering/phase.cpp
index c95b0eb067f67d4a82b61938fb3893e64795c126..f3b2ff83a6ee0aba42f56ab2082eb0483dc834ac 100644
--- a/ets2panda/compiler/lowering/phase.cpp
+++ b/ets2panda/compiler/lowering/phase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/phase.h b/ets2panda/compiler/lowering/phase.h
index c1b59ed0982231093880265e43d1947b311e370b..490c2fac13b5ac2ba47bf964e7ddff2a3fdb0259 100644
--- a/ets2panda/compiler/lowering/phase.h
+++ b/ets2panda/compiler/lowering/phase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/compiler/lowering/util.cpp b/ets2panda/compiler/lowering/util.cpp
index 247f182093c3aadccab01eb842fd1e022f4e33b9..b63145fc6303023aeda79e0e7450003176e398bd 100644
--- a/ets2panda/compiler/lowering/util.cpp
+++ b/ets2panda/compiler/lowering/util.cpp
@@ -40,7 +40,7 @@ ir::Identifier *Gensym(ArenaAllocator *allocator)
     const ArenaString s {allocator->Adapter()};
     const auto str = ss.str();
     auto *arena_pointer = allocator->Alloc(str.size() + 1);
-    std::memmove(arena_pointer, reinterpret_cast<const void *>(str.c_str()), str.size() + 1);
+    memmove_s(arena_pointer, str.size() + 1, reinterpret_cast<const void *>(str.c_str()), str.size() + 1);
     return allocator->New<ir::Identifier>(util::StringView(reinterpret_cast<const char *>(arena_pointer)), allocator);
 }
 
diff --git a/ets2panda/ir/as/namedType.cpp b/ets2panda/ir/as/namedType.cpp
index 8cd429a9bf3dffb425b8075aa0ce07c52fabf5d0..1957c7a148cc2c3732419abbb46ea19bcc4ae699 100644
--- a/ets2panda/ir/as/namedType.cpp
+++ b/ets2panda/ir/as/namedType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/as/namedType.h b/ets2panda/ir/as/namedType.h
index 595aa39c01108f025410425f7b6f340996ca277f..c8d58f3d3375f3701aaa9e54d0ad35f4a1897d51 100644
--- a/ets2panda/ir/as/namedType.h
+++ b/ets2panda/ir/as/namedType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/as/prefixAssertionExpression.cpp b/ets2panda/ir/as/prefixAssertionExpression.cpp
index 27d697f40809414e3b820c9f947529e2f1466552..9d16342536c0d1d11ac42be1cedf12fe6d2d641c 100644
--- a/ets2panda/ir/as/prefixAssertionExpression.cpp
+++ b/ets2panda/ir/as/prefixAssertionExpression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/as/prefixAssertionExpression.h b/ets2panda/ir/as/prefixAssertionExpression.h
index 60377a5179529688a3e21ea6f5d4aa71cb414eac..245bf27996c344f92985c535e413b450894a07bb 100644
--- a/ets2panda/ir/as/prefixAssertionExpression.h
+++ b/ets2panda/ir/as/prefixAssertionExpression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/astNodeFlags.h b/ets2panda/ir/astNodeFlags.h
index d8e7329a0a6e9884bbed8e24cd0114e0c9e25f14..83ed05029a77e84dda3e0e2e350c866d69d1f0d8 100644
--- a/ets2panda/ir/astNodeFlags.h
+++ b/ets2panda/ir/astNodeFlags.h
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/ets2panda/ir/base/classElement.cpp b/ets2panda/ir/base/classElement.cpp
index fd04aed68cd7004a6f0caacb642f10c15761cd4a..192aecf3038e85c9818b50e6e3161d8c24b5efe7 100644
--- a/ets2panda/ir/base/classElement.cpp
+++ b/ets2panda/ir/base/classElement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/base/classElement.h b/ets2panda/ir/base/classElement.h
index 796fde132fa4f1e30e0386916bffbcf60c270146..ea99fb156653d56d229f50c4ff6972157bae7382 100644
--- a/ets2panda/ir/base/classElement.h
+++ b/ets2panda/ir/base/classElement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/base/classStaticBlock.cpp b/ets2panda/ir/base/classStaticBlock.cpp
index 012595ebe4441171fff0650b0cd84525f864ccf4..4f0b307bbbcdb48f605a2a43a3099db54e0968ba 100644
--- a/ets2panda/ir/base/classStaticBlock.cpp
+++ b/ets2panda/ir/base/classStaticBlock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/base/classStaticBlock.h b/ets2panda/ir/base/classStaticBlock.h
index 08d9a97a2b15722f816a1d98ce6d183dad6a6ac0..f0539a3323da28a9d6c477a864f5fe6df170387d 100644
--- a/ets2panda/ir/base/classStaticBlock.h
+++ b/ets2panda/ir/base/classStaticBlock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/base/templateElement.cpp b/ets2panda/ir/base/templateElement.cpp
index e5650900a5fd7be6f05c580a286b9e970bd77b31..8a0e7d317ee2ca4c6cdd02508ea2490ef5eb7ca5 100644
--- a/ets2panda/ir/base/templateElement.cpp
+++ b/ets2panda/ir/base/templateElement.cpp
@@ -28,7 +28,7 @@ void TemplateElement::Dump(ir::AstDumper *dumper) const
 {
     dumper->Add({
         {"type", "TemplateElement"},
-        {"value", {{"raw", /* raw_ */ ""}, {"cooked", /* cooked_ */ ""}}},
+        {"value", {{"raw", ""}, {"cooked", ""}}},
     });
 }
 
diff --git a/ets2panda/ir/ets/etsClassLiteral.cpp b/ets2panda/ir/ets/etsClassLiteral.cpp
index 4b8673ebdb5f6b95ba3462129b3a263b8c346fb8..79c11f531ecd7fc26d5fb88e412abc91c73b012b 100644
--- a/ets2panda/ir/ets/etsClassLiteral.cpp
+++ b/ets2panda/ir/ets/etsClassLiteral.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsClassLiteral.h b/ets2panda/ir/ets/etsClassLiteral.h
index af4a875648c2c8fb4973badda066eafb2cbe0dcf..64dadfd65bbfb304b5a993444ee73cbba8bbe36f 100644
--- a/ets2panda/ir/ets/etsClassLiteral.h
+++ b/ets2panda/ir/ets/etsClassLiteral.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsFunctionType.cpp b/ets2panda/ir/ets/etsFunctionType.cpp
index c4b962e10aab21c04c1455bd5678fca9b890f772..57e2248c5636d922988e83ab2e0197695e8c9644 100644
--- a/ets2panda/ir/ets/etsFunctionType.cpp
+++ b/ets2panda/ir/ets/etsFunctionType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsFunctionType.h b/ets2panda/ir/ets/etsFunctionType.h
index ca4cfcf2c7d812e9903b43940a3ea3097ac195ba..62c59ffd9fb30b2a00ef9ef17bfc878c4961f611 100644
--- a/ets2panda/ir/ets/etsFunctionType.h
+++ b/ets2panda/ir/ets/etsFunctionType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsImportDeclaration.h b/ets2panda/ir/ets/etsImportDeclaration.h
index 1a583ad4fb196eb9794d94124ea472bd2d172d65..cd6be9e417f9443c39dade15e732500a55a17a8c 100644
--- a/ets2panda/ir/ets/etsImportDeclaration.h
+++ b/ets2panda/ir/ets/etsImportDeclaration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsImportSource.cpp b/ets2panda/ir/ets/etsImportSource.cpp
index a73b779c3e1f11d26b5fbbca698a47bcabb256b9..edf3658ce5f416bcfdaf9382b8bad51bf80c302f 100644
--- a/ets2panda/ir/ets/etsImportSource.cpp
+++ b/ets2panda/ir/ets/etsImportSource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsLaunchExpression.cpp b/ets2panda/ir/ets/etsLaunchExpression.cpp
index 44976cdb5f7f9f2e886c9adb79d73a677dadcab1..f5d880a47f87fba81be68b8bcdd7c9ea5d3983b0 100644
--- a/ets2panda/ir/ets/etsLaunchExpression.cpp
+++ b/ets2panda/ir/ets/etsLaunchExpression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsNewArrayInstanceExpression.cpp b/ets2panda/ir/ets/etsNewArrayInstanceExpression.cpp
index e837295c0ed73ea150968c477efed4988285e9cc..bf3d63aafe6f8230f4e2f8cb39ebd7dc9b536ce3 100644
--- a/ets2panda/ir/ets/etsNewArrayInstanceExpression.cpp
+++ b/ets2panda/ir/ets/etsNewArrayInstanceExpression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsNewArrayInstanceExpression.h b/ets2panda/ir/ets/etsNewArrayInstanceExpression.h
index 68b5f7d13404ed44f4c0dcc971a667e42a1ae402..553bb75120377bf84d5ead2276bf5323fbf855b6 100644
--- a/ets2panda/ir/ets/etsNewArrayInstanceExpression.h
+++ b/ets2panda/ir/ets/etsNewArrayInstanceExpression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsNewClassInstanceExpression.cpp b/ets2panda/ir/ets/etsNewClassInstanceExpression.cpp
index 37f27e54b81ef434a97944674b158b7c2733eef0..0e55a8ac981c704ab2e0c4719cf31b7094de37d2 100644
--- a/ets2panda/ir/ets/etsNewClassInstanceExpression.cpp
+++ b/ets2panda/ir/ets/etsNewClassInstanceExpression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsNewClassInstanceExpression.h b/ets2panda/ir/ets/etsNewClassInstanceExpression.h
index e35c911063dc6ed6b222e4d5b1af7c68924e6d86..ffed6e65cdd9747a1bde4c1841d2ce62757f987f 100644
--- a/ets2panda/ir/ets/etsNewClassInstanceExpression.h
+++ b/ets2panda/ir/ets/etsNewClassInstanceExpression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsNewMultiDimArrayInstanceExpression.cpp b/ets2panda/ir/ets/etsNewMultiDimArrayInstanceExpression.cpp
index d9b5d78eb103d17a88df5134a0fef6edec7c2f1a..3671c96b28d60c2b1e9c1f9b1465aea951eb4738 100644
--- a/ets2panda/ir/ets/etsNewMultiDimArrayInstanceExpression.cpp
+++ b/ets2panda/ir/ets/etsNewMultiDimArrayInstanceExpression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsPackageDeclaration.cpp b/ets2panda/ir/ets/etsPackageDeclaration.cpp
index 9ed77697fb0f19292003f371ad47188617a6a59e..b31ed8e71ba451b99890227ca2d99567b4091c56 100644
--- a/ets2panda/ir/ets/etsPackageDeclaration.cpp
+++ b/ets2panda/ir/ets/etsPackageDeclaration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsPackageDeclaration.h b/ets2panda/ir/ets/etsPackageDeclaration.h
index 6a843313d2cc24c8ec968f972fda81f811cb79bc..8ca20442d3d93240c979767e8aae6325cd873180 100644
--- a/ets2panda/ir/ets/etsPackageDeclaration.h
+++ b/ets2panda/ir/ets/etsPackageDeclaration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsParameterExpression.cpp b/ets2panda/ir/ets/etsParameterExpression.cpp
index a4eab69aba039f4bca2edef92366ce5a697fbe05..bb0172b423fb8709b45b962774c37a9c49063fb6 100644
--- a/ets2panda/ir/ets/etsParameterExpression.cpp
+++ b/ets2panda/ir/ets/etsParameterExpression.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsParameterExpression.h b/ets2panda/ir/ets/etsParameterExpression.h
index e068b4e3b73e2bc3a29f8e033cea07664e4c6be6..4ea4ed1e32ad11db3db905048e24868de9c89732 100644
--- a/ets2panda/ir/ets/etsParameterExpression.h
+++ b/ets2panda/ir/ets/etsParameterExpression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsPrimitiveType.cpp b/ets2panda/ir/ets/etsPrimitiveType.cpp
index c2934842b573cbd07ecae71a03b386e5b5096b9b..f8debf89803a4bf2c1e7b11d8194eed7aa09bb42 100644
--- a/ets2panda/ir/ets/etsPrimitiveType.cpp
+++ b/ets2panda/ir/ets/etsPrimitiveType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsPrimitiveType.h b/ets2panda/ir/ets/etsPrimitiveType.h
index 94df4d0eb7a0cce242401fc80356fed055a6ff39..8086c24a37ff9f58e9059478b26c74851b806cf2 100644
--- a/ets2panda/ir/ets/etsPrimitiveType.h
+++ b/ets2panda/ir/ets/etsPrimitiveType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsScript.cpp b/ets2panda/ir/ets/etsScript.cpp
index 27972213820c8b625758f805160433ecab1b070e..3931ae75cc9d94ac76af5b767a8b152379050b4e 100644
--- a/ets2panda/ir/ets/etsScript.cpp
+++ b/ets2panda/ir/ets/etsScript.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsScript.h b/ets2panda/ir/ets/etsScript.h
index 6ab6a2346552af32f965c22bbbe117c02b68f5d9..7900b5f473226b3daf75db14438fde273bfd9a9b 100644
--- a/ets2panda/ir/ets/etsScript.h
+++ b/ets2panda/ir/ets/etsScript.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsStructDeclaration.cpp b/ets2panda/ir/ets/etsStructDeclaration.cpp
index 0f62efc3caabbccafde4b829b6f214dbf9cb2b68..8bd7ed765a9957726b5a8c9f231372d41af095e9 100644
--- a/ets2panda/ir/ets/etsStructDeclaration.cpp
+++ b/ets2panda/ir/ets/etsStructDeclaration.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsStructDeclaration.h b/ets2panda/ir/ets/etsStructDeclaration.h
index 9dc920dc91e5732e79d368d2ae6102371f1553ab..90a448f581dfdf1ad83d074484be39a8ffb47acb 100644
--- a/ets2panda/ir/ets/etsStructDeclaration.h
+++ b/ets2panda/ir/ets/etsStructDeclaration.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsTypeReference.cpp b/ets2panda/ir/ets/etsTypeReference.cpp
index 274f7584a719664e03c13c8566f4f10a21ce2701..07935632c0abedfd69249c3db796ab45e96e2e34 100644
--- a/ets2panda/ir/ets/etsTypeReference.cpp
+++ b/ets2panda/ir/ets/etsTypeReference.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsTypeReference.h b/ets2panda/ir/ets/etsTypeReference.h
index adadc8fd96d79c3b587967dc29961b5a3ae9e64c..d23a1a5cbe581a8c24a60bcb469cb5c775e20635 100644
--- a/ets2panda/ir/ets/etsTypeReference.h
+++ b/ets2panda/ir/ets/etsTypeReference.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsTypeReferencePart.cpp b/ets2panda/ir/ets/etsTypeReferencePart.cpp
index 2bdb6d282c38c0244f4a3f20f5537efff25ee1d1..ca7207a6f0227fe0102187d16dcc86d02a07d258 100644
--- a/ets2panda/ir/ets/etsTypeReferencePart.cpp
+++ b/ets2panda/ir/ets/etsTypeReferencePart.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsTypeReferencePart.h b/ets2panda/ir/ets/etsTypeReferencePart.h
index 25b9611bbae5e5b5094e75f0a58b420d31920e3b..6c48c560da50248b3d40feac3445091ba32ec311 100644
--- a/ets2panda/ir/ets/etsTypeReferencePart.h
+++ b/ets2panda/ir/ets/etsTypeReferencePart.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsUnionType.cpp b/ets2panda/ir/ets/etsUnionType.cpp
index e811f5a37d816364392c73030c8f1174b4ce992e..803a0598f749891cd6a9d88f6fd9b4356d2e11d8 100644
--- a/ets2panda/ir/ets/etsUnionType.cpp
+++ b/ets2panda/ir/ets/etsUnionType.cpp
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsUnionType.h b/ets2panda/ir/ets/etsUnionType.h
index c7f146794c0071eedc11af9c0cbd2535ee17229a..a5a37940b723e9a8b25ea889251b138aace80dd9 100644
--- a/ets2panda/ir/ets/etsUnionType.h
+++ b/ets2panda/ir/ets/etsUnionType.h
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+/*
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsWildcardType.cpp b/ets2panda/ir/ets/etsWildcardType.cpp
index d389a94820970b98fce6abd582d1589bf1ba76e6..1ca7675248050e7252ed434b373615789367bfa6 100644
--- a/ets2panda/ir/ets/etsWildcardType.cpp
+++ b/ets2panda/ir/ets/etsWildcardType.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/ets/etsWildcardType.h b/ets2panda/ir/ets/etsWildcardType.h
index eb9c17a333e24f8c0bca2d1e0b08d89d0d5c2117..624057c01c8a1f572587818681a94a3c707b1072 100644
--- a/ets2panda/ir/ets/etsWildcardType.h
+++ b/ets2panda/ir/ets/etsWildcardType.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/expressions/directEvalExpression.h b/ets2panda/ir/expressions/directEvalExpression.h
index c9ecd693f9ada5612d211a83fc892151df368d63..eca191333919c1ad2372095147cc0326165dbdca 100644
--- a/ets2panda/ir/expressions/directEvalExpression.h
+++ b/ets2panda/ir/expressions/directEvalExpression.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/irnode.cpp b/ets2panda/ir/irnode.cpp
index 4f2344a4bef6f5fdc49ee1f2fa45d3d5ac7026bd..7f270a9014da580b7a7425b997fdb459da2f2f27 100644
--- a/ets2panda/ir/irnode.cpp
+++ b/ets2panda/ir/irnode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/opaqueTypeNode.cpp b/ets2panda/ir/opaqueTypeNode.cpp
index 977e9efd708810ddac5ef099c927c32ec7c8dfe7..caa23c61331bc4f76205925f84116c44f3979c7b 100644
--- a/ets2panda/ir/opaqueTypeNode.cpp
+++ b/ets2panda/ir/opaqueTypeNode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/opaqueTypeNode.h b/ets2panda/ir/opaqueTypeNode.h
index 676f5478d4a703855479052ec88cfb2b6bad9d70..bdd09667bb12789f2d49ff8f8c4bfdc98fecaf77 100644
--- a/ets2panda/ir/opaqueTypeNode.h
+++ b/ets2panda/ir/opaqueTypeNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/opcodeMap.h b/ets2panda/ir/opcodeMap.h
index a6073bcb99624014b88267f82fd8209eca68440d..e6deaf249ac41fc0d6bec317efef9068dd90f300 100644
--- a/ets2panda/ir/opcodeMap.h
+++ b/ets2panda/ir/opcodeMap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/statements/assertStatement.cpp b/ets2panda/ir/statements/assertStatement.cpp
index ded0f277170515d97b251becc546cce4d550b822..dd5ddb3b3e7cb49a225e57bcdc28b28fc23a3e64 100644
--- a/ets2panda/ir/statements/assertStatement.cpp
+++ b/ets2panda/ir/statements/assertStatement.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/ir/statements/assertStatement.h b/ets2panda/ir/statements/assertStatement.h
index 749c5c739be791db07da7efdc043137f83d23f2d..e66acedc864197bd635f4c78263cf317a372a0b0 100644
--- a/ets2panda/ir/statements/assertStatement.h
+++ b/ets2panda/ir/statements/assertStatement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/ASLexer.cpp b/ets2panda/lexer/ASLexer.cpp
index 188161e89b4a1ac400d5d3a72ef30b0852113f0c..aed23b0caae92f0d984e046ea3b5d0b2f1ea2e8c 100644
--- a/ets2panda/lexer/ASLexer.cpp
+++ b/ets2panda/lexer/ASLexer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/ASLexer.h b/ets2panda/lexer/ASLexer.h
index 6fe3ec048afbb67bdec5bf014cdfac416f65b910..e3015c4147a240d7a5cec2c5cb4f0c185fd0d0ae 100644
--- a/ets2panda/lexer/ASLexer.h
+++ b/ets2panda/lexer/ASLexer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/ETSLexer.cpp b/ets2panda/lexer/ETSLexer.cpp
index 935daba8028c3c453b7379daff0c8e805d0d97a0..aa5b41719e415209dd3a73e0980931a12c6fa3fc 100644
--- a/ets2panda/lexer/ETSLexer.cpp
+++ b/ets2panda/lexer/ETSLexer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/ETSLexer.h b/ets2panda/lexer/ETSLexer.h
index 32a4c4147ad7b452abb49ee5e4f2c6e00af4d4a6..1ad9801099336f62558f21e607ea0b0dc1975223 100644
--- a/ets2panda/lexer/ETSLexer.h
+++ b/ets2panda/lexer/ETSLexer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/TSLexer.cpp b/ets2panda/lexer/TSLexer.cpp
index c2f3cc5cf0d7b85f964d44566bcb23c3ed35e2de..13fd19ea4547717f4de429cced5a36ac5863c36f 100644
--- a/ets2panda/lexer/TSLexer.cpp
+++ b/ets2panda/lexer/TSLexer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/TSLexer.h b/ets2panda/lexer/TSLexer.h
index b4c1aa307da2fd0f5f697ec0c0a7d83b8b23f2c8..64a4dee1356bf45169f240f3b1d00e8477976a75 100644
--- a/ets2panda/lexer/TSLexer.h
+++ b/ets2panda/lexer/TSLexer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/keywords.cpp b/ets2panda/lexer/keywords.cpp
index c5ea702c238f120d93e62ea512b3685cd5bf9095..3e5cd087554c63ef9d3cd064103b794055b857d1 100644
--- a/ets2panda/lexer/keywords.cpp
+++ b/ets2panda/lexer/keywords.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/keywordsBase.h b/ets2panda/lexer/keywordsBase.h
index a7d1d0f4764d6a60dba4530d69cfe04cfcbfdabd..b1651473fa579397103edd057f0244224b8c7177 100644
--- a/ets2panda/lexer/keywordsBase.h
+++ b/ets2panda/lexer/keywordsBase.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/token/number.cpp b/ets2panda/lexer/token/number.cpp
index 3cbb8bc542581699dac8f4751376cbb9e96fd8d7..afc22d4399951299b9192d39f2835453327bdd9f 100644
--- a/ets2panda/lexer/token/number.cpp
+++ b/ets2panda/lexer/token/number.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/lexer/token/number.h b/ets2panda/lexer/token/number.h
index 840285f60c8f6bfe8b9da01532b1a005bbe70685..7afd5aec3de1e8923654c2305100a8d279abd308 100644
--- a/ets2panda/lexer/token/number.h
+++ b/ets2panda/lexer/token/number.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/parser/ETSparser.cpp b/ets2panda/parser/ETSparser.cpp
index 736173af5a6ed0d3feb07fc69f0cef8a06e35907..7338be7acdbd4305d103f8fc4fdfd01bec649469 100644
--- a/ets2panda/parser/ETSparser.cpp
+++ b/ets2panda/parser/ETSparser.cpp
@@ -3025,7 +3025,8 @@ ir::AnnotatedExpression *ETSParser::GetAnnotatedExpressionFromParam()
                 parameter->SetRange(
                     {parameter->AsIdentifier()->Decorators().front()->Start(), Lexer()->GetToken().End()});
             }
-        } break;
+            break;
+        }
 
         case lexer::TokenType::PUNCTUATOR_PERIOD_PERIOD_PERIOD: {
             const auto start_loc = Lexer()->GetToken().Start();
@@ -3040,7 +3041,8 @@ ir::AnnotatedExpression *ETSParser::GetAnnotatedExpressionFromParam()
 
             parameter = AllocNode<ir::SpreadElement>(ir::AstNodeType::REST_ELEMENT, Allocator(), rest_ident);
             parameter->SetRange({start_loc, Lexer()->GetToken().End()});
-        } break;
+            break;
+        }
 
         default: {
             ThrowSyntaxError("Unexpected token, expected an identifier.");
diff --git a/ets2panda/public/es2panda_lib.cpp b/ets2panda/public/es2panda_lib.cpp
index 690e286a0308e2290f14e82bf9ab937b44e0852e..6b6c6e5cf449bf91a56ad8835176fa9a9796107e 100644
--- a/ets2panda/public/es2panda_lib.cpp
+++ b/ets2panda/public/es2panda_lib.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/public/es2panda_lib.h b/ets2panda/public/es2panda_lib.h
index 0873d590d993b9d6a870de63814f4996ff94d096..d20aee7772e0c1f5f4cc3047186ae80618a76845 100644
--- a/ets2panda/public/es2panda_lib.h
+++ b/ets2panda/public/es2panda_lib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2021 - 2023 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/ets2panda/scripts/es2panda_coverage.sh b/ets2panda/scripts/es2panda_coverage.sh
index 387dc73a57e23a6903457eab4b595444b7d1f01f..9af403a22b0ae730a15b89be8ff1a68916fcccb6 100644
--- a/ets2panda/scripts/es2panda_coverage.sh
+++ b/ets2panda/scripts/es2panda_coverage.sh
@@ -26,7 +26,7 @@ case "$ARGUMENT" in
 esac
 done
 
-python $PANDA_ROOT/plugins/ecmascript/es2panda/scripts/test-runner.py \
+python $PANDA_ROOT/plugins/ecmascript/es2panda/scripts/test_runner.py \
     --builddir $PANDA_BINARY_ROOT --arkdir $PANDA_ROOT --all
 
 gcov $PANDA_BINARY_ROOT/plugins/ecmascript/es2panda/CMakeFiles/es2panda-lib.dir/*/*
diff --git a/ets2panda/scripts/test-runner.py b/ets2panda/scripts/test_runner.py
similarity index 99%
rename from ets2panda/scripts/test-runner.py
rename to ets2panda/scripts/test_runner.py
index aeb156848f822ac79e6cab0d12ced34baa4f6618..e759dddc0241f33ce5e599c5bbcbb2b393da7253 100644
--- a/ets2panda/scripts/test-runner.py
+++ b/ets2panda/scripts/test_runner.py
@@ -19,6 +19,7 @@ import subprocess
 import sys
 from pathlib import Path
 
+
 def parse_options():
     # panda root default
     panda_env = os.environ.get('PANDA_ROOT')