#94: getStringByStringPoolPos

Tea-club · Jun 12, 2024 · 5e53f47 · 5e53f47
1 parent e7de959
commit 5e53f47
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/include/ChaiVM/interpreter/code-manager/code-manager.hpp b/include/ChaiVM/interpreter/code-manager/code-manager.hpp
@@ -60,7 +60,7 @@ class CodeManager final {
      * @param reg_val Number from constant pool.
      * @return String.
      */
-    const std::string &getCnstStringByReg(chsize_t reg_val);
+    const std::string &getStringByStringPoolPos(chsize_t reg_val);
 
     Immidiate addCnstString(std::string &&str);
 

diff --git a/src/ChaiVM/interpreter/code-manager/code-manager.cpp b/src/ChaiVM/interpreter/code-manager/code-manager.cpp
@@ -144,7 +144,7 @@ const std::string &CodeManager::getCnstStringByImm(Immidiate imm) {
     return stringPool_[constantPool_[imm]];
 }
 
-const std::string &CodeManager::getCnstStringByReg(chsize_t reg_val) {
+const std::string &CodeManager::getStringByStringPoolPos(chsize_t reg_val) {
     return stringPool_[reg_val];
 }
 

diff --git a/src/ChaiVM/interpreter/executor.cpp b/src/ChaiVM/interpreter/executor.cpp
@@ -364,16 +364,16 @@ void Executor::set_f64in_arr(Instruction ins) {
 }
 
 void Executor::string_print(Instruction ins) {
-    const std::string &str = codeManager_->getCnstStringByReg(acc());
+    const std::string &str = codeManager_->getStringByStringPoolPos(acc());
     std::cout << str << std::endl;
     advancePc();
     DO_NEXT_INS();
 }
 
 void Executor::string_concat(Instruction ins) {
-    const std::string &str1 = codeManager_->getCnstStringByReg(acc());
+    const std::string &str1 = codeManager_->getStringByStringPoolPos(acc());
     const std::string &str2 =
-        codeManager_->getCnstStringByReg((*currentFrame_)[ins.r1]);
+        codeManager_->getStringByStringPoolPos((*currentFrame_)[ins.r1]);
     std::string concated = str1 + str2;
     acc() =
         codeManager_->getCnst(codeManager_->addCnstString(std::move(concated)));
@@ -382,12 +382,12 @@ void Executor::string_concat(Instruction ins) {
 }
 
 void Executor::string_len(Instruction ins) {
-    acc() = codeManager_->getCnstStringByReg(acc()).size();
+    acc() = codeManager_->getStringByStringPoolPos(acc()).size();
     advancePc();
     DO_NEXT_INS();
 }
 void Executor::string_slice(Instruction ins) {
-    const std::string &str = codeManager_->getCnstStringByReg(acc());
+    const std::string &str = codeManager_->getStringByStringPoolPos(acc());
     acc() = codeManager_->getCnst(codeManager_->addCnstString(
         str.substr((*currentFrame_)[ins.r1],
                    (*currentFrame_)[ins.r2] - (*currentFrame_)[ins.r1])));

diff --git a/test/ChaiVM/interpreter/executor_test.cpp b/test/ChaiVM/interpreter/executor_test.cpp
@@ -650,7 +650,7 @@ TEST_F(ExecutorTest, StringPrint) {
     load<Ret>();
     update();
     exec_.run();
-    EXPECT_EQ(codeManager_.getCnstStringByReg(exec_.acc()), "ABOBA");
+    EXPECT_EQ(codeManager_.getStringByStringPoolPos(exec_.acc()), "ABOBA");
     EXPECT_EQ(codeManager_.getCnstStringByImm(raw), "ABOBA");
 }
 
@@ -669,7 +669,7 @@ TEST_F(ExecutorTest, StringConcat) {
     EXPECT_EQ(codeManager_.getCnstStringByImm(raw1), "ABOBA");
     EXPECT_EQ(codeManager_.getCnstStringByImm(raw2), " Yeash");
     exec_.run();
-    EXPECT_EQ(codeManager_.getCnstStringByReg(exec_.acc()), "ABOBA Yeash");
+    EXPECT_EQ(codeManager_.getStringByStringPoolPos(exec_.acc()), "ABOBA Yeash");
 }
 
 TEST_F(ExecutorTest, StringSize) {
@@ -696,6 +696,6 @@ TEST_F(ExecutorTest, StringSlice) {
     load<Ret>();
     update();
     exec_.run();
-    EXPECT_EQ(codeManager_.getCnstStringByReg(exec_.acc()), "BOB");
+    EXPECT_EQ(codeManager_.getStringByStringPoolPos(exec_.acc()), "BOB");
     EXPECT_EQ(codeManager_.getCnstStringByImm(raw), "ABOBA");
 }
diff --git a/test/ChaiVM/interpreter/simple-programs-executor-test.cpp b/test/ChaiVM/interpreter/simple-programs-executor-test.cpp
@@ -149,5 +149,5 @@ TEST_F(ExecutorTest, StringDemo) {
     load<Ret>();
     update();
     exec_.run();
-    EXPECT_EQ(codeManager_.getCnstStringByReg(exec_.acc()), "Hellodragons");
+    EXPECT_EQ(codeManager_.getStringByStringPoolPos(exec_.acc()), "Hellodragons");
 }
diff --git a/test/frontend/assembler/assembler-test.cpp b/test/frontend/assembler/assembler-test.cpp
@@ -61,7 +61,7 @@ TEST_F(AssemblerTest, strings) {
     asM.assemble();
     codeManager_.load(output_);
     exec_.run();
-    EXPECT_EQ(codeManager_.getCnstStringByReg(exec_.acc()), "Hello world");
+    EXPECT_EQ(codeManager_.getStringByStringPoolPos(exec_.acc()), "Hello world");
 }
 
 TEST_F(AssemblerTest, simpleFunction) {