Skip to content

Conversation

jcfr
Copy link
Contributor

@jcfr jcfr commented Aug 28, 2025

This pull request updates simplecpp anticipating the integration of changes intended to improve the generation of wrapper on macOS:

It also update the declaration of filedata variable in main.cpp to account for the introduction of simplecpp::FileDataCache structure through danmar/simplecpp@a0430f3 (previously it was declared as std::map<std::string, TokenList*>)


Upstream: danmar/simplecpp@538c5c4
Source date: 2025-08-23
Files:

generator/simplecpp/simplecpp.h
generator/simplecpp/simplecpp.cpp

Patch: generator/simplecpp/do_not_stop_on_error.patch re-applied

Compare: danmar/simplecpp@a853253...538c5c4


List of simplecpp changes:

$ git shortlog --no-merges a853253..538c5c4 -- simplecpp.*
Daniel Marjamäki (6):
      Fix #403 (Stack overflow in Macro::expand()) (#411)
      Fix #409 (fuzzing crash in simplecpp::Macro::expandToken()) (#412)
      Revert "fix: use both absolute and relative header paths in header matching (#362)" (#415)
      Revert "Fix #404: simplecpp::TokenList::constFold does not fold '( 0 ) && 10 < X' properly (#405)" (#416)
      Fix #446 (change the rules of relativeness preserving to depend on the source file including it for relative path includes) (#445)
      Fix #471 (preserve line splicing information in '// ..' comments) (#472)

Ludvig Gunne Lindström (3):
      Fix #454: Accept __has_include for GNU C standards (#456)
      Fix #452: Undefined function-style macro does not cause an error (#453)
      fix #459: Set __STRICT_ANSI__=1 for non-gnu standards (#460)

Oliver Stöneberg (1):
      simplecpp.cpp: fixed Visual Studio C4800 compiler warnings (#481)

Tal500 (4):
      fix: use both absolute and relative header paths in header matching (#362)
      Fix relative paths, again (#418)
      Preserve relativeness of included paths (w.r.t. current directory) (#428)
      fix: parent relative paths, and rework on the whole path extraction mechanics (#429)

clock999 (1):
      fix #337 - line splicing in comment not handled properly (#431)

glankk (8):
      Fix #381 (When there are header files with the same name, the correct file cannot be found) (#443)
      Fix #368 (__VA_OPT__ is not handled good enough) (#451)
      Fix #449 (Update c++ standard to c++11) (#450)
      Add caching of conditional directive chains (#468)
      Include and path handling optimization (#447)
      Fix #391 (`__TIME__` replacement might be empty depending on compiler) (#441)
      Remove execute bit from simplecpp.cpp/h (#494)
      Fix infinite loop with circular includes (#497)

olabetskyi (1):
      Fix #404: simplecpp::TokenList::constFold does not fold '( 0 ) && 10 < X' properly (#405)

jcfr added 2 commits August 28, 2025 01:52
Specifying the exact commit improves traceability.
…v1.2.0 (a853253)

Upstream: danmar/simplecpp@538c5c4
Source date: 2025-08-23
Files:   generator/simplecpp/simplecpp.h, generator/simplecpp/simplecpp.cpp
Patch:   generator/simplecpp/do_not_stop_on_error.patch re-applied

Compare: danmar/simplecpp@a853253...538c5c4
@mrbean-bremen
Copy link
Contributor

I had the slight hope that this would fix #276, but alas... still no wrappers generated under macOS in the CI.
I guess you are generating wrappers for macOS, though?

Copy link
Contributor

@mrbean-bremen mrbean-bremen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mrbean-bremen mrbean-bremen merged commit 4891b1b into MeVisLab:master Aug 28, 2025
19 checks passed
@jcfr
Copy link
Contributor Author

jcfr commented Aug 28, 2025

Thanks for the review 🙏 & integration 🚀

I guess you are generating wrappers for macOS, though?

Now that this is integrated, I will contribute the changes to support macOS. Those will be based of commontk/simplecpp@patched-2025-08-23-538c5c4cd including backports based of pull requests I contributed to the upstream simplecpp project that are being reviewed.

@jcfr jcfr deleted the update-simplecpp-to-latest branch August 28, 2025 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants