From 3fd76105cd6b4c9f813a83e58655a1ffd4ef161b Mon Sep 17 00:00:00 2001
From: gavin1012_hw <wanggang203@huawei.com>
Date: Tue, 19 Jul 2022 16:03:46 +0800
Subject: [PATCH] Fix function name from 'func_name_idx' into '#idx#funcname'
 style

Issue: I5IH16

Signed-off-by: gavin1012_hw <wanggang203@huawei.com>
Change-Id: I5db082280ae896bfaead96833654c6a765e12c97
---
 es2panda/binder/binder.cpp | 17 +++++++++++++----
 es2panda/binder/binder.h   | 12 +++++++++++-
 es2panda/util/ustring.h    |  5 +++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/es2panda/binder/binder.cpp b/es2panda/binder/binder.cpp
index d2a8b2ad39..de4a302447 100644
--- a/es2panda/binder/binder.cpp
+++ b/es2panda/binder/binder.cpp
@@ -80,7 +80,7 @@ void Binder::IdentifierAnalysis()
     ASSERT(program_->Ast());
     ASSERT(scope_ == topScope_);
 
-    BuildFunction(topScope_, "main");
+    BuildFunction(topScope_, MAIN_FUNC_NAME);
     ResolveReferences(program_->Ast());
     AddMandatoryParams();
 }
@@ -160,13 +160,22 @@ void Binder::LookupIdentReference(ir::Identifier *ident)
 
 void Binder::BuildFunction(FunctionScope *funcScope, util::StringView name)
 {
-    uint32_t idx = functionScopes_.size();
     functionScopes_.push_back(funcScope);
 
+    bool funcNameWithoutDot = (name.Find(".") == std::string::npos);
+    bool funcNameWithoutBackslash = (name.Find("\\") == std::string::npos);
+    if (name != ANONYMOUS_FUNC_NAME && funcNameWithoutDot && funcNameWithoutBackslash && !functionNames_.count(name)) {
+        functionNames_.insert(name);
+        funcScope->BindName(name, name);
+        return;
+    }
     std::stringstream ss;
-    ss << "func_" << name << "_" << std::to_string(idx);
+    uint32_t idx = functionNameIndex_++;
+    ss << "#" << std::to_string(idx) << "#";
+    if (funcNameWithoutDot && funcNameWithoutBackslash) {
+        ss << name;
+    }
     util::UString internalName(ss.str(), Allocator());
-
     funcScope->BindName(name, internalName.View());
 }
 
diff --git a/es2panda/binder/binder.h b/es2panda/binder/binder.h
index 28f4b038d2..90f06aebf7 100644
--- a/es2panda/binder/binder.h
+++ b/es2panda/binder/binder.h
@@ -41,7 +41,12 @@ class VariableScope;
 
 class Binder {
 public:
-    explicit Binder(parser::Program *program) : program_(program), functionScopes_(Allocator()->Adapter()) {}
+    explicit Binder(parser::Program *program)
+        : program_(program),
+          functionScopes_(Allocator()->Adapter()),
+          functionNames_(Allocator()->Adapter())
+    {
+    }
     NO_COPY_SEMANTIC(Binder);
     DEFAULT_MOVE_SEMANTIC(Binder);
     ~Binder() = default;
@@ -104,6 +109,9 @@ public:
     static constexpr std::string_view LEXICAL_MANDATORY_PARAM_NEW_TARGET = "!nt";
     static constexpr std::string_view LEXICAL_MANDATORY_PARAM_THIS = "!t";
 
+    static constexpr std::string_view MAIN_FUNC_NAME = "func_main_0";
+    static constexpr std::string_view ANONYMOUS_FUNC_NAME = "";
+
 private:
     using MandatoryParams = std::array<std::string_view, MANDATORY_PARAMS_NUMBER>;
 
@@ -138,6 +146,8 @@ private:
     GlobalScope *topScope_ {};
     Scope *scope_ {};
     ArenaVector<FunctionScope *> functionScopes_;
+    ArenaSet<util::StringView> functionNames_;
+    size_t functionNameIndex_ {1};
 };
 
 template <typename T>
diff --git a/es2panda/util/ustring.h b/es2panda/util/ustring.h
index 1801234961..4114601087 100644
--- a/es2panda/util/ustring.h
+++ b/es2panda/util/ustring.h
@@ -109,6 +109,11 @@ public:
         return StringView(std::string_view(sv_.data() + begin, end - begin));
     }
 
+    constexpr size_t Find(const char *str)
+    {
+        return sv_.find(str);
+    }
+
     static bool IsHighSurrogate(char32_t cp)
     {
         return (cp >= Constants::SURROGATE_HIGH_MIN && cp < Constants::SURROGATE_HIGH_MAX);
-- 
Gitee