Redef fix

[mgeplf]

No description provided.

[azure-pipelines]

✔️ 00c147c -> Azure artifacts URL

[azure-pipelines]

✔️ 00c147c -> Azure artifacts URL

[azure-pipelines]

✔️ a4be9da -> Azure artifacts URL

[mgeplf]

This helps a lot with having one less indirection, in addition, the ordering of includes is simplified, since now some code doesn't depend on having redef.h and its defines pulled in.

I think we have two options: either I can un-comment everything in redef.h, so that for backwards compat, one can still include it if there is old code that uses the old names (like: PRintf).

In my opinion, however, it would be best to have any code that is like that updated to to the "correct' names (ie: hoc_PRintf.)

Thus, I prefer the second option: delete the redef.h file.

Thoughts? @1uc / @pramodk / @alkino / @nrnhines (and whoever else should look at this)?

[1uc]

This comes down to whether MOD files use the redef.h. If not then I think removing it would be best. If yes, then it feels like another case where we want to use NMODL to modernize MOD files automatically, e.g.

nmodl foo.mod modernize redef

to specifically modernize the redef related change. Other string would be used to modernize other things.

[github-actions]

NEURON ModelDB CI: launching for a4be9da via its drop url

[azure-pipelines]

✔️ a4be9da -> Azure artifacts URL

[azure-pipelines]

✔️ 0a4cc74 -> Azure artifacts URL

[codecov]

Codecov Report

Attention: Patch coverage is 72.38606% with 206 lines in your changes missing coverage. Please review.

Project coverage is 67.26%. Comparing base (9373eef) to head (2e5251e).
Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
src/oc/code.cpp	73.37%	41 Missing ⚠️
src/oc/nonlin.cpp	0.00%	39 Missing ⚠️
src/oc/axis.cpp	0.00%	29 Missing ⚠️
src/oc/parse.ypp	87.43%	26 Missing ⚠️
src/oc/hoc.cpp	82.88%	19 Missing ⚠️
src/oc/fileio.cpp	77.96%	13 Missing ⚠️
src/oc/code2.cpp	47.82%	12 Missing ⚠️
src/oc/plt.cpp	0.00%	10 Missing ⚠️
src/oc/plot.cpp	16.66%	5 Missing ⚠️
src/oc/xred.cpp	0.00%	4 Missing ⚠️
... and 5 more

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3065      +/-   ##
==========================================
- Coverage   67.27%   67.26%   -0.01%     
==========================================
  Files         571      571              
  Lines      104865   104868       +3     
==========================================
- Hits        70548    70542       -6     
- Misses      34317    34326       +9     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[github-actions]

NEURON ModelDB CI: launching for 0a4cc74 via its drop url

[github-actions]

NEURON ModelDB CI: 0a4cc74 -> download reports from here

[1uc]

NMODL DB CI says (unless I'm reading it incorrectly) that everything is fine.

[1uc]

As far as I can tell this PR carries out the renaming described in redef.h. I think this is valuable, because the defined macros have a tendency to clash with regular identifiers. It also improves consistency which is appreciated.

I feel this is a good thing to merge. @mgeplf could you please remove redef.h?

[mgeplf]

@1uc > I feel this is a good thing to merge. @mgeplf could you please remove redef.h?

Yes, no problem; done and done.

[1uc]

Very good! Let's give @nrnhines and @ramcdougal an opportunity to review if they wish to. There's a summary of what the PR does here:
#3065 (review)

[sonarcloud]

Quality Gate passed

Issues
81 New issues
0 Accepted issues

Measures
4 Security Hotspots
0.0% Coverage on New Code
1.2% Duplication on New Code

See analysis details on SonarCloud

[azure-pipelines]

✔️ 2e5251e -> Azure artifacts URL

[alkino]

Of course I love it !

[bbpbuildbot]

Logfiles from GitLab pipeline #230013 (:white_check_mark:) have been uploaded here!

Status and direct links:

• ✅ mac_m1_cmake_build: [cmake, ON, OFF, OFF, address]
• ✅ spack_setup
• ✅ build:nmodl
• ✅ build:neuron:nmodl:intel:legacy
• ✅ build:neuron:nmodl:intel:shared
• ✅ build:neuron:nmodl:nvhpc:acc:legacy
• ✅ build:neuron:nmodl:nvhpc:acc:shared
• ✅ build:neuron:nmodl:nvhpc:omp:legacy
• ✅ build:neuron:nmodl:nvhpc:omp
• ✅ test:neuron:nmodl:intel:legacy
• ✅ test:neuron:nmodl:intel:shared
• ✅ test:neuron:nmodl:nvhpc:acc:legacy
• ✅ test:neuron:nmodl:nvhpc:acc:shared
• ✅ test:neuron:nmodl:nvhpc:omp:legacy
• ✅ test:neuron:nmodl:nvhpc:omp

[nrnhines]

Glad this was done.