Skip to content

Generator class holds a reference to an analyser model #1439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickerso merged 7 commits into from
Jul 8, 2026
+27 −0
Merged

Generator class holds a reference to an analyser model #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13a6dac
Create test showing generator holding onto analyserModel.
hsorby Jun 15, 2026
432049b
Fix Generator holding onto AnalyserModel handles.
hsorby Jun 15, 2026
f436327
Fix code formatting error in tests/generator/generator.cpp.
hsorby Jun 15, 2026
1abb771
Merge branch 'main' into issue1395
hsorby Jul 6, 2026
e5afa1a
Address review coments.
hsorby Jul 6, 2026
d935403
Merge branch 'issue1395' of github.com:hsorby/libcellml into issue1395
hsorby Jul 6, 2026
326404a
Delete empty lines.
hsorby Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2282,6 +2282,8 @@ std::string Generator::interfaceCode(const AnalyserModelPtr &analyserModel, cons

pFunc()->addInterfaceComputeModelMethodsCode();

pFunc()->mAnalyserModel = nullptr;
Comment thread
agarny marked this conversation as resolved.

return pFunc()->mCode;
}

Expand Down Expand Up @@ -2414,6 +2416,8 @@ std::string Generator::implementationCode(const AnalyserModelPtr &analyserModel,

pFunc()->addImplementationComputeVariablesMethodCode(remainingAnalyserEquations);

pFunc()->mAnalyserModel = nullptr;
Comment thread
agarny marked this conversation as resolved.

return pFunc()->mCode;
}

Expand Down
23 changes: 23 additions & 0 deletions tests/generator/generator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1754,3 +1754,26 @@ TEST(Generator, generateCodeUsingProfileEnum)

EXPECT_EQ_FILE_CONTENTS("generator/algebraic_eqn_computed_var_on_rhs/model.py", generator->implementationCode(analyserModel, libcellml::GeneratorProfile::Profile::PYTHON));
}

TEST(Generator, checkGeneratorReleasesAnalyserModel)
{
auto parser = libcellml::Parser::create();
auto model = parser->parseModel(fileContents("generator/algebraic_eqn_computed_var_on_rhs/model.cellml"));
auto analyser = libcellml::Analyser::create();

analyser->analyseModel(model);

auto analyserModel = analyser->analyserModel();

EXPECT_EQ(2, analyserModel.use_count());
EXPECT_EQ("x = a", libcellml::Generator::equationCode(analyserModel->analyserEquation(0)->ast()));
EXPECT_EQ(2, analyserModel.use_count());

auto generator = libcellml::Generator::create();

EXPECT_EQ_FILE_CONTENTS("generator/algebraic_eqn_computed_var_on_rhs/model.c", generator->implementationCode(analyserModel));
EXPECT_EQ(2, analyserModel.use_count());

EXPECT_EQ_FILE_CONTENTS("generator/algebraic_eqn_computed_var_on_rhs/model.h", generator->interfaceCode(analyserModel));
EXPECT_EQ(2, analyserModel.use_count());
}
Loading