Skip to content

Add writer for 2D array string case#12290

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
ktf merged 3 commits into from
Nov 24, 2023
Merged

Add writer for 2D array string case #12290

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2be212
Add writer for 2D array string case
njacazio Nov 21, 2023
ed6641d
Update VariantJSONHelpers.h
njacazio Nov 22, 2023
66aa4e4
Update VariantJSONHelpers.h
njacazio Nov 22, 2023
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
10 changes: 6 additions & 4 deletions Framework/Core/include/Framework/VariantJSONHelpers.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -201,7 +201,7 @@ struct VariantReader : public rapidjson::BaseReaderHandler<rapidjson::UTF8<>, Va
return false;
}
if (states.top() == State::IN_DATA) {
//no previous keys
//no previous keys
states.push(State::IN_KEY);
currentKey = str;
return true;
Expand DownExpand Up@@ -281,14 +281,14 @@ struct VariantReader : public rapidjson::BaseReaderHandler<rapidjson::UTF8<>, Va
return false;
}
if (states.top() == State::IN_ARRAY) {
//finish up array
//finish up array
states.pop();
if constexpr (isArray2D<V>() || isLabeledArray<V>()) {
rows = elementCount;
}
return true;
} else if (states.top() == State::IN_ROW) {
//finish up row
//finish up row
states.pop();
if constexpr (isArray2D<V>() || isLabeledArray<V>()) {
cols = elementCount;
Expand DownExpand Up@@ -350,6 +350,8 @@ void writeVariant(std::ostream& o, Variant const& v)
w.Int(array2d(i, j));
} else if constexpr (std::is_same_v<float, T> || std::is_same_v<double, T>) {
w.Double(array2d(i, j));
} else if constexpr (std::is_same_v<std::string, T>) {
w.String(array2d(i, j).c_str());
}
}
w.EndArray();
Expand DownExpand Up@@ -447,6 +449,6 @@ struct VariantJSONHelpers {
}
}
};
}
} // namespace o2::framework

#endif // FRAMEWORK_VARIANTJSONHELPERS_H