Serialisation macros: increase upper bound on number of member variables #2287

pfeatherstone · 2020-07-18T15:19:05Z

This pull request contains a bit of rough and ready code to generate the serialisation/deserialisation macros. The upper bound on number of member variables is increased to 64. You can increase the upper bound arbitrarily using the aforementioned code.

…ion/deserialisation macros for custom types

…ation/deserialisation macros for custom types - netbeans project configurations

…ation/deserialisation macros for custom types - updated .gitignore file to ignore "dist" and "build" directories in netbeans project

…ation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64

…ation/deserialisation macros for custom types - updated .gitignore file to ignore private netbeans project configurations

pfeatherstone · 2020-07-18T15:20:42Z

This solves #2267

coveralls · 2020-07-18T16:57:58Z

Coverage remained the same at 100.0% when pulling 35b899e on pfeatherstone:develop into 43ab8a2 on nlohmann:develop.

pfeatherstone · 2020-07-18T22:23:42Z

@nlohmann There is one test that is failing in continuous-integration, specifically with configuration "Xcode: xcode10 C++ AMD64". All other tests are fine. It's failing on 'download_test_data'. Any ideas?

nlohmann · 2020-07-19T07:13:53Z

I restarted the job.

pfeatherstone · 2020-07-19T08:48:12Z

I restarted the job.

Thanks. Ready for review

add inline specifier for detail::combine

nlohmann

I think having the tools/NlohmannMacroBuilder/main.cpp file is sufficient, and it should be moved into third_party/macro_builder/main.cpp to avoid creating a new directory. The Makefiles etc. are overhead as the tool will (if ever) be called by a maintainer if we ever find 64 arguments to be insufficient.

tools/NlohmannMacroBuilder/main.cpp

Add static assertion for missing binary function in SAX interface

…ion/deserialisation macros for custom types

…ation/deserialisation macros for custom types - netbeans project configurations

…ation/deserialisation macros for custom types - updated .gitignore file to ignore "dist" and "build" directories in netbeans project

…ation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64

…ation/deserialisation macros for custom types - updated .gitignore file to ignore private netbeans project configurations

…Current upper bound on number of member variables is set to 64

…develop

…third_party directory

…ation macro building code, can revert the changes made to the .gitignore file

…ialisation macros

…nt instead. Does the job

test/src/unit-udt_macro.cpp

…ing a temporary bool.

pfeatherstone · 2020-07-20T07:06:59Z

Ok, the combination of valgrind with some of the older compilers doesn't like using std::tie and std::tuple to implement the operator== overload in the unit test. It complains with error Conditional jump or move depends on uninitialised value(s)

…lgrind and clang < 4 complain

pfeatherstone · 2020-07-20T07:33:41Z

Rewrote operator==. Doesn't use std::tie. Hopefully, valgrind and clang will no longer complain about uninitialised variables

pfeatherstone · 2020-07-20T07:34:46Z

This is still not ready as I have to rebase the fork. This will require a battle with git which i don't have time for today.

nlohmann · 2020-07-20T07:35:46Z

No need to rebase as long as there are no merge conflicts.

… up. std::tie probably wasn't the problem initially

pfeatherstone · 2020-07-20T16:44:11Z

@nlohmann Seems to be ready

nlohmann

Looks good to me.

nlohmann · 2020-07-20T19:37:09Z

Thanks!

nlohmann · 2020-07-20T19:37:51Z

🔖 Release item

This issue/PR will be part of the next release of the library. This template helps preparing the release notes.

Type

Description

Serialisation macros: increase upper bound on number of member variables. Custom types : MACRO expansion bug #2267 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE fails if the length of the argument is 10 #2280 Serialisation macros: increase upper bound on number of member variables #2287

nlohmann and others added 9 commits July 17, 2020 20:41

🚸 add static assertion for missing binary function in SAX interface

7fc4b29

add inline specifier for detail::combine

281349d

run amalgamate

88243b3

[JSON] dirty code for building intrusive and non-intrusive serialisat…

beb1fb4

…ion/deserialisation macros for custom types

[JSON] - dirty code for building intrusive and non-intrusive serialis…

8730af0

…ation/deserialisation macros for custom types - netbeans project configurations

[JSON] - dirty code for building intrusive and non-intrusive serialis…

9afe757

…ation/deserialisation macros for custom types - updated .gitignore file to ignore "dist" and "build" directories in netbeans project

[JSON] - dirty code for building intrusive and non-intrusive serialis…

4706d6e

…ation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64

[JSON] - dirty code for building intrusive and non-intrusive serialis…

c122d8a

…ation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64

[JSON] - dirty code for building intrusive and non-intrusive serialis…

0d2d088

…ation/deserialisation macros for custom types - updated .gitignore file to ignore private netbeans project configurations

pfeatherstone requested a review from nlohmann as a code owner July 18, 2020 15:19

Merge pull request #2285 from T0b1-iOS/develop

1fd6c58

add inline specifier for detail::combine

This was linked to issues Jul 19, 2020

Custom types : MACRO expansion bug #2267

Closed

NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE fails if the length of the argument is 10 #2280

Closed

nlohmann requested changes Jul 19, 2020

View reviewed changes

tools/NlohmannMacroBuilder/main.cpp Outdated Show resolved Hide resolved

nlohmann and others added 11 commits July 19, 2020 18:09

Merge pull request #2282 from nlohmann/missing_sax_check

b1da58b

Add static assertion for missing binary function in SAX interface

[JSON] dirty code for building intrusive and non-intrusive serialisat…

68122fe

…ion/deserialisation macros for custom types

[JSON] - dirty code for building intrusive and non-intrusive serialis…

5eb739a

…ation/deserialisation macros for custom types - netbeans project configurations

[JSON] - dirty code for building intrusive and non-intrusive serialis…

a575008

…ation/deserialisation macros for custom types - updated .gitignore file to ignore "dist" and "build" directories in netbeans project

[JSON] - dirty code for building intrusive and non-intrusive serialis…

8a04571

…ation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64

[JSON] - dirty code for building intrusive and non-intrusive serialis…

0b744e1

…ation/deserialisation macros for custom types - used code to increase the upper bound on number of member variables to 64

[JSON] - dirty code for building intrusive and non-intrusive serialis…

21bd6e9

…ation/deserialisation macros for custom types - updated .gitignore file to ignore private netbeans project configurations

[JSON] rough and ready code for generating (de)serialisation macros. …

0a158ee

…Current upper bound on number of member variables is set to 64

Merge branch 'develop' of https://github.com/pfeatherstone/json into …

f7374c9

…develop

[JSON] as per Nlohmann's suggestion, moved the macro builder code to …

8f14aaa

…third_party directory

[JSON] since we no longer use a netbeans project for the (de)serialis…

75a6888

…ation macro building code, can revert the changes made to the .gitignore file

pfeatherstone added 3 commits July 19, 2020 18:12

[JSON] as per Nlohmann's suggestion, added unit tests for the (de)ser…

6d9b204

…ialisation macros

[JSON] doctest: need another section ?

578217e

[JSON] CHECK in doctest only accepts std::string ? Use assert stateme…

254f0e3

…nt instead. Does the job

nlohmann requested changes Jul 19, 2020

View reviewed changes

test/src/unit-udt_macro.cpp Outdated Show resolved Hide resolved

pfeatherstone added 2 commits July 19, 2020 21:25

[JSON] use CHECK from doctest

e83ddb1

[JSON] don't know why CHECK doesn't like "CHECK(obj1 == obj2)". So us…

678d310

…ing a temporary bool.

[JSON] drop use of std::tie and std::tupe for operator== overload. va…

7660ea1

…lgrind and clang < 4 complain

[JSON] initialise all member variables. Maybe this will shut valgrind…

35b899e

… up. std::tie probably wasn't the problem initially

nlohmann approved these changes Jul 20, 2020

View reviewed changes

nlohmann merged commit 8344857 into nlohmann:develop Jul 20, 2020

nlohmann self-assigned this Jul 20, 2020

nlohmann added this to the Release 3.8.1 milestone Jul 20, 2020

nlohmann added the release item: ⚡ improvement label Jul 20, 2020

gregmarr mentioned this pull request Jun 30, 2022

Add templated version of DEFINE_TYPE macros #2843

Open

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Serialisation macros: increase upper bound on number of member variables #2287

Serialisation macros: increase upper bound on number of member variables #2287

pfeatherstone commented Jul 18, 2020

pfeatherstone commented Jul 18, 2020

coveralls commented Jul 18, 2020 •

edited

Loading

pfeatherstone commented Jul 18, 2020

nlohmann commented Jul 19, 2020

pfeatherstone commented Jul 19, 2020

nlohmann left a comment

pfeatherstone commented Jul 20, 2020

pfeatherstone commented Jul 20, 2020

pfeatherstone commented Jul 20, 2020

nlohmann commented Jul 20, 2020

pfeatherstone commented Jul 20, 2020

nlohmann left a comment

nlohmann commented Jul 20, 2020

nlohmann commented Jul 20, 2020

Serialisation macros: increase upper bound on number of member variables #2287

Serialisation macros: increase upper bound on number of member variables #2287

Conversation

pfeatherstone commented Jul 18, 2020

pfeatherstone commented Jul 18, 2020

coveralls commented Jul 18, 2020 • edited Loading

pfeatherstone commented Jul 18, 2020

nlohmann commented Jul 19, 2020

pfeatherstone commented Jul 19, 2020

nlohmann left a comment

Choose a reason for hiding this comment

pfeatherstone commented Jul 20, 2020

pfeatherstone commented Jul 20, 2020

pfeatherstone commented Jul 20, 2020

nlohmann commented Jul 20, 2020

pfeatherstone commented Jul 20, 2020

nlohmann left a comment

Choose a reason for hiding this comment

nlohmann commented Jul 20, 2020

nlohmann commented Jul 20, 2020

🔖 Release item

Type

Description

coveralls commented Jul 18, 2020 •

edited

Loading