Skip to content

signature attribute; small cleanup #1187

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

Merged
eddelbuettel merged 1 commit into from
Oct 26, 2021
Merged

signature attribute; small cleanup #1187

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/attributes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,11 @@ namespace attributes {
Param sigParam = paramNamed(kExportSignature);
std::string sig = sigParam.value();
trimWhitespace(&sig);
if(sig.empty()) return sig;
if(sig.back() == '}')
sig = sig.substr(0, sig.size()-1);
// check sig.empty again since we deleted an element
if(sig.empty()) return sig;
if(sig.front() == '{')
sig.erase(0,1);
return sig;
Expand Down Expand Up @@ -1444,8 +1447,8 @@ namespace attributes {
const std::string delimiters(",");
std::vector<Param> params;
std::string::size_type current;
std::string::size_type next = -1;
std::string::size_type signature_param_start = -1;
std::string::size_type next = std::string::npos;
std::string::size_type signature_param_start = std::string::npos;
do { // #nocov
next = input.find_first_not_of(delimiters, next + 1);
if (next == std::string::npos)
Expand All @@ -1463,7 +1466,7 @@ namespace attributes {

// if the signature param was found, then check that the name,
// start block and end block exist and are in the correct order
if(signature_param_start != static_cast<std::string::size_type>(-1)) {
if(signature_param_start != std::string::npos) {
bool sigchecks =
signature_param_start < blockstart &&
blockstart < blockend &&
Expand Down