Skip to content

Commit 68bc1aa

Browse files
committed
Pass CppCodeGenerator to InstructionBuilder
1 parent 15e4aca commit 68bc1aa

6 files changed

Lines changed: 29 additions & 15 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CppCodeBuilder::CppCodeBuilder(CppCompilerContext *ctx, BlockPrototype *procedur
1515
m_ctx(ctx),
1616
m_procedurePrototype(procedurePrototype),
1717
m_codeType(codeType),
18+
m_instructionBuilder(m_codeGen),
1819
m_codeAnalyzer(ctx)
1920
{
2021
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "../icodebuilder.h"
88
#include "cppinstruction.h"
99
#include "cppinstructionlist.h"
10+
#include "cppcodegenerator.h"
1011
#include "instructions/instructionbuilder.h"
1112
#include "../codeanalyzer.h"
1213

@@ -127,6 +128,7 @@ class CppCodeBuilder : public ICodeBuilder
127128
std::vector<std::shared_ptr<CppValue>> m_values;
128129
std::vector<std::shared_ptr<CompilerLocalVariable>> m_localVars;
129130
CppInstructionList m_instructions;
131+
CppCodeGenerator m_codeGen;
130132
cppins::InstructionBuilder m_instructionBuilder;
131133
CodeAnalyzer m_codeAnalyzer;
132134
bool m_warp = false;

‎src/engine/internal/codegen/cpp/instructions/instructionbuilder.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
using namespace libscratchcpp;
1616
using namespace libscratchcpp::cppins;
1717

18-
InstructionBuilder::InstructionBuilder()
18+
InstructionBuilder::InstructionBuilder(CppCodeGenerator &codeGen)
1919
{
2020
// Create groups
21-
m_groups.push_back(std::make_shared<Functions>());
22-
m_groups.push_back(std::make_shared<Math>());
23-
m_groups.push_back(std::make_shared<Comparison>());
24-
m_groups.push_back(std::make_shared<String>());
25-
m_groups.push_back(std::make_shared<Logic>());
26-
m_groups.push_back(std::make_shared<Control>());
27-
m_groups.push_back(std::make_shared<Variables>());
28-
m_groups.push_back(std::make_shared<Lists>());
29-
m_groups.push_back(std::make_shared<Procedures>());
21+
m_groups.push_back(std::make_shared<Functions>(codeGen));
22+
m_groups.push_back(std::make_shared<Math>(codeGen));
23+
m_groups.push_back(std::make_shared<Comparison>(codeGen));
24+
m_groups.push_back(std::make_shared<String>(codeGen));
25+
m_groups.push_back(std::make_shared<Logic>(codeGen));
26+
m_groups.push_back(std::make_shared<Control>(codeGen));
27+
m_groups.push_back(std::make_shared<Variables>(codeGen));
28+
m_groups.push_back(std::make_shared<Lists>(codeGen));
29+
m_groups.push_back(std::make_shared<Procedures>(codeGen));
3030
}
3131

3232
CppInstruction *InstructionBuilder::process(CppInstruction *ins)

‎src/engine/internal/codegen/cpp/instructions/instructionbuilder.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace libscratchcpp::cppins
1313
class InstructionBuilder
1414
{
1515
public:
16-
InstructionBuilder();
16+
InstructionBuilder(CppCodeGenerator &codeGen);
1717

1818
CppInstruction *process(CppInstruction *ins);
1919

‎src/engine/internal/codegen/cpp/instructions/instructiongroup.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using namespace libscratchcpp::cppins;
66

7-
InstructionGroup::InstructionGroup()
7+
InstructionGroup::InstructionGroup(CppCodeGenerator &codeGen) :
8+
m_codeGen(codeGen)
89
{
910
}

‎src/engine/internal/codegen/cpp/instructions/instructiongroup.h‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,25 @@
44

55
#include "processresult.h"
66

7-
namespace libscratchcpp::cppins
7+
namespace libscratchcpp
8+
{
9+
10+
class CppCodeGenerator;
11+
12+
namespace cppins
813
{
914

1015
class InstructionGroup
1116
{
1217
public:
13-
InstructionGroup();
18+
InstructionGroup(CppCodeGenerator &codeGen);
1419

1520
virtual ProcessResult process(CppInstruction *ins) = 0;
21+
22+
protected:
23+
CppCodeGenerator &m_codeGen;
1624
};
1725

18-
} // namespace libscratchcpp::cppins
26+
} // namespace cppins
27+
28+
} // namespace libscratchcpp

0 commit comments

Comments
 (0)