Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit 29357d4

Browse files
Nicolas CornuNicolas Cornu
authored andcommitted
Remove k_const
1 parent cd5728e commit 29357d4

File tree

3 files changed

+8
-20
lines changed

3 files changed

+8
-20
lines changed

src/codegen/codegen_c_visitor.cpp

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,11 +1299,6 @@ void CodegenCVisitor::print_global_var_struct_decl() {
12991299
printer->add_line(fmt::format("{} {}_global;", global_struct(), info.mod_suffix));
13001300
}
13011301

1302-
std::string CodegenCVisitor::k_const() {
1303-
return "const ";
1304-
}
1305-
1306-
13071302
/****************************************************************************************/
13081303
/* printing routines for code generation */
13091304
/****************************************************************************************/
@@ -1914,7 +1909,7 @@ CodegenCVisitor::ParamVector CodegenCVisitor::internal_method_parameters() {
19141909
params.emplace_back("", "IonCurVar&", "", "ionvar");
19151910
}
19161911
params.emplace_back("", "double*", "", "data");
1917-
params.emplace_back(k_const(), "Datum*", "", "indexes");
1912+
params.emplace_back("const", "Datum*", "", "indexes");
19181913
params.emplace_back(param_type_qualifier(), "ThreadDatum*", "", "thread");
19191914
params.emplace_back(param_type_qualifier(), "NrnThread*", param_ptr_qualifier(), "nt");
19201915
params.emplace_back("", "double", "", "v");
@@ -2953,17 +2948,17 @@ void CodegenCVisitor::print_mechanism_range_var_structure() {
29532948
for (auto& var: codegen_float_variables) {
29542949
auto name = var->get_name();
29552950
auto type = get_range_var_float_type(var);
2956-
auto qualifier = is_constant_variable(name) ? k_const() : "";
2951+
auto qualifier = is_constant_variable(name) ? "const " : "";
29572952
printer->add_line(fmt::format("{}{}* {}{};", qualifier, type, ptr_type_qualifier(), name));
29582953
}
29592954
for (auto& var: codegen_int_variables) {
29602955
auto name = var.symbol->get_name();
29612956
if (var.is_index || var.is_integer) {
2962-
auto qualifier = var.is_constant ? k_const() : "";
2957+
auto qualifier = var.is_constant ? "const " : "";
29632958
printer->add_line(
29642959
fmt::format("{}{}* {}{};", qualifier, int_type, ptr_type_qualifier(), name));
29652960
} else {
2966-
auto qualifier = var.is_constant ? k_const() : "";
2961+
auto qualifier = var.is_constant ? "const " : "";
29672962
auto type = var.is_vdata ? "void*" : default_float_data_type();
29682963
printer->add_line(
29692964
fmt::format("{}{}* {}{};", qualifier, type, ptr_type_qualifier(), name));
@@ -3372,10 +3367,10 @@ void CodegenCVisitor::print_global_function_common_code(BlockType type,
33723367
printer->add_line("int nodecount = ml->nodecount;");
33733368
printer->add_line("int pnodecount = ml->_nodecount_padded;");
33743369
printer->add_line(
3375-
fmt::format("{}int* {}node_index = ml->nodeindices;", k_const(), ptr_type_qualifier()));
3370+
fmt::format("const int* {}node_index = ml->nodeindices;", ptr_type_qualifier()));
33763371
printer->add_line(fmt::format("double* {}data = ml->data;", ptr_type_qualifier()));
33773372
printer->add_line(
3378-
fmt::format("{}double* {}voltage = nt->_actual_v;", k_const(), ptr_type_qualifier()));
3373+
fmt::format("const double* {}voltage = nt->_actual_v;", ptr_type_qualifier()));
33793374

33803375
if (type == BlockType::Equation) {
33813376
printer->add_line(

src/codegen/codegen_c_visitor.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -909,13 +909,6 @@ class CodegenCVisitor: public visitor::ConstAstVisitor {
909909
virtual std::string param_ptr_qualifier();
910910

911911

912-
/**
913-
* Returns the \c const keyword
914-
* \return \c const
915-
*/
916-
virtual std::string k_const();
917-
918-
919912
/**
920913
* Prints the start of the \c coreneuron namespace
921914
*/

src/codegen/codegen_ispc_visitor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,10 +379,10 @@ void CodegenIspcVisitor::print_global_function_common_code(BlockType type,
379379
printer->add_line("uniform int nodecount = ml->nodecount;");
380380
printer->add_line("uniform int pnodecount = ml->_nodecount_padded;");
381381
printer->add_line(
382-
fmt::format("{}int* {}node_index = ml->nodeindices;", k_const(), ptr_type_qualifier()));
382+
fmt::format("const int* {}node_index = ml->nodeindices;", ptr_type_qualifier()));
383383
printer->add_line(fmt::format("double* {}data = ml->data;", ptr_type_qualifier()));
384384
printer->add_line(
385-
fmt::format("{}double* {}voltage = nt->_actual_v;", k_const(), ptr_type_qualifier()));
385+
fmt::format("const double* {}voltage = nt->_actual_v;", ptr_type_qualifier()));
386386

387387
if (type == BlockType::Equation) {
388388
printer->add_line(

0 commit comments

Comments
 (0)