Skip to content

Getters for optional values in cpp should return a const reference #2675

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Getters for optional values in cpp should return a const reference #2675

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b75dd91
Fix to C++ getters that return an optional.
flounderpinto Jan 14, 2025
de4bfaa
Test commit.
flounderpinto Jan 14, 2025
486b243
Reverted commit.
flounderpinto Jan 14, 2025
203794d
Added the CheckConstraint methods for optional values.
flounderpinto Jan 16, 2025
764617e
Removed trailing spaces.
flounderpinto Jan 16, 2025
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
79 changes: 74 additions & 5 deletions packages/quicktype-core/src/language/CPlusPlus/CPlusPlusRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,10 +848,7 @@ export class CPlusPlusRenderer extends ConvenienceRenderer {
* a member called 'value' value = value will screw up the compiler
*/
const checkConst = this.lookupGlobalName(GlobalNames.CheckConstraint);
if (
(property.type instanceof UnionType && property.type.findMember("null") !== undefined) ||
(property.isOptional && property.type.kind !== "null" && property.type.kind !== "any")
) {
if (property.type instanceof UnionType && property.type.findMember("null") !== undefined) {
this.emitLine(rendered, " ", getterName, "() const { return ", name, "; }");
if (constraints?.has(jsonName)) {
this.emitLine(
Expand Down Expand Up @@ -1832,6 +1829,40 @@ export class CPlusPlusRenderer extends ConvenienceRenderer {
this.ensureBlankLine();
}
);

this.ensureBlankLine();

this.emitBlock(
[
"inline void ",
checkConst,
"(",
this._stringType.getConstType(),
" name, ",
this.withConst(classConstraint),
" & c, ",
"const ",
this._optionalType,
"<",
cppType,
"> & value)"
],
false,
() => {
this.emitBlock(
["if (value)"],
false,
() => {
this.emitLine(
checkConst,
"(name, c, *value);"
);
}
);
this.ensureBlankLine();
}
);

this.ensureBlankLine();
}

Expand Down Expand Up @@ -1921,7 +1952,12 @@ export class CPlusPlusRenderer extends ConvenienceRenderer {
}

const checkConst = this.lookupGlobalName(GlobalNames.CheckConstraint);
this.emitNumericCheckConstraints(checkConst, classConstraint, getterMinIntValue, getterMaxIntValue, "int64_t");
this.emitNumericCheckConstraints(
checkConst,
classConstraint,
getterMinIntValue,
getterMaxIntValue,
"int64_t");
this.emitNumericCheckConstraints(
checkConst,
classConstraint,
Expand Down Expand Up @@ -2040,6 +2076,39 @@ export class CPlusPlusRenderer extends ConvenienceRenderer {
this.ensureBlankLine();
}
);

this.ensureBlankLine();

this.emitBlock(
[
"inline void ",
checkConst,
"(",
this._stringType.getConstType(),
" name, ",
this.withConst(classConstraint),
" & c, ",
"const ",
this._optionalType,
"<",
this._stringType.getType(),
">& value)"
],
false,
() => {
this.emitBlock(
["if (value)"],
false,
() => {
this.emitLine(
checkConst,
"(name, c, *value);"
);
}
);
this.ensureBlankLine();
}
);
}

protected emitHelperFunctions(): void {
Expand Down