Skip to content

Commit 0d92146

Browse files
committed
CppCodeGenerator: Fix undefined return string identifier
1 parent 2eade6e commit 0d92146

4 files changed

Lines changed: 29 additions & 1 deletion

File tree

‎src/engine/internal/codegen/cpp/cppcodegenerator.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ void CppCodeGenerator::createCall(const std::string &name, CppIdentifier::Type r
224224
// Strings are returned through an output parameter
225225
includeHeader(Header::ExecutionContext);
226226
strRet = addStringAlloca();
227+
228+
if (retValue)
229+
m_identifiers[retValue] = m_strings.back();
227230
}
228231

229232
m_codeStream.beginLine();

‎src/engine/internal/codegen/cpp/cppcodegenerator.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#pragma once
44

55
#include <scratchcpp/compiler.h>
6+
#include <test_export.h>
67
#include <unordered_map>
78
#include <sstream>
89

@@ -15,7 +16,7 @@ namespace libscratchcpp
1516

1617
class CppValue;
1718

18-
class CppCodeGenerator
19+
class LIBSCRATCHCPP_TEST_EXPORT CppCodeGenerator
1920
{
2021
public:
2122
CppCodeGenerator();

‎test/codegen/cpp/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
add_executable(
22
cpp_test
33
main.cpp
4+
cppcodegenerator_test.cpp
45
cppexecutioncontext_test.cpp
56
cppexecutablecode_test.cpp
67
cppexecutablecodemock.h
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// SPDX-License-Identifier: Apache-2.0
2+
3+
#include <gtest/gtest.h>
4+
5+
#include <engine/internal/codegen/cpp/cppcodegenerator.h>
6+
#include <engine/internal/codegen/cpp/cppvalue.h>
7+
8+
using namespace libscratchcpp;
9+
10+
TEST(CppCodeGeneratorTest, StringReturnValueCanBePassedToAnotherCall)
11+
{
12+
CppCodeGenerator codeGen;
13+
CppValue stringResult(Compiler::StaticType::String);
14+
stringResult.isRawValue = true;
15+
16+
codeGen.createCall("test_function_no_args_ret", CppIdentifier::Type::StringPtr, &stringResult, false, false, {});
17+
18+
const CppIdentifier *stringArg = codeGen.castValue(&stringResult, Compiler::StaticType::String);
19+
codeGen.createCall("test_print_string", false, false, { stringArg });
20+
21+
const std::string source = codeGen.finalize();
22+
EXPECT_NE(source.find("test_print_string(string0)"), std::string::npos);
23+
}

0 commit comments

Comments
 (0)