Skip to content

make it possible to explicitly disable the legacy TokenList constructors #621

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

Open
firewave wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −2
Open

make it possible to explicitly disable the legacy TokenList constructors #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5af99c9
make it possible to explicitly disable the legacy `TokenList` constru…
firewave Jan 14, 2026
73ab5c1
main.cpp: disabled legacy `TokenList` constructors
firewave Jan 14, 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
1 change: 1 addition & 0 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Copyright (C) 2016-2023 simplecpp team
*/

#define SIMPLECPP_TOKENLIST_ALLOW_PTR 0
#include "simplecpp.h"

#include <cstdlib>
Expand Down
6 changes: 4 additions & 2 deletions simplecpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@
#ifndef SIMPLECPP_TOKENLIST_ALLOW_PTR
// still provide the legacy API in case we lack the performant wrappers
# if !defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
# define SIMPLECPP_TOKENLIST_ALLOW_PTR
# define SIMPLECPP_TOKENLIST_ALLOW_PTR 1
# else
# define SIMPLECPP_TOKENLIST_ALLOW_PTR 0
# endif
#endif

Expand Down Expand Up @@ -267,7 +269,7 @@ namespace simplecpp {
TokenList(const unsigned char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
: TokenList(data, size-1, filenames, filename, outputList, 0)
{}
#ifdef SIMPLECPP_TOKENLIST_ALLOW_PTR
#if SIMPLECPP_TOKENLIST_ALLOW_PTR
Copy link
Owner

@danmar danmar Jan 19, 2026

Choose a reason for hiding this comment

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

If this macro is optional, I have the feeling it's better to write:

Suggested change
#if SIMPLECPP_TOKENLIST_ALLOW_PTR
#if defined(SIMPLECPP_TOKENLIST_ALLOW_PTR) && SIMPLECPP_TOKENLIST_ALLOW_PTR

Copy link
Owner

@danmar danmar Jan 19, 2026

Choose a reason for hiding this comment

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

I am not sure what the standard says about this condition if the macro is not defined.

Copy link
Collaborator Author

@firewave firewave Jan 19, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

The code above will make sure it is always defined.

/** generates a token list from the given buffer */
TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
: TokenList(data, size, filenames, filename, outputList, 0)
Expand Down