Skip to content

[pigeon] Object type in class integration tests #4384

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
auto-submit merged 10 commits into from
Jul 11, 2023
Merged

[pigeon] Object type in class integration tests #4384

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
27998b8
add object, gen
tarrinneal Jul 6, 2023
4c65d64
unrevert
tarrinneal Jul 6, 2023
6047b8f
missed one
tarrinneal Jul 6, 2023
049b9a6
cpp "fixes"
tarrinneal Jul 6, 2023
0b54de8
fix?
tarrinneal Jul 7, 2023
0dcf19c
Merge branch 'main' of github.com:flutter/packages into object-test
tarrinneal Jul 7, 2023
5f0c689
simpler
tarrinneal Jul 7, 2023
37e28b3
changelog
tarrinneal Jul 7, 2023
ae52174
more gen
tarrinneal Jul 8, 2023
fb5c6cb
nits
tarrinneal Jul 10, 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
Prev Previous commit
nits
  • Loading branch information
@tarrinneal
tarrinneal committed Jul 10, 2023
commit fb5c6cb547ec180ee37d8c3d22e30c035983b130
4 changes: 2 additions & 2 deletions packages/pigeon/lib/cpp_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,8 @@ class CppSourceGenerator extends StructuredGenerator<CppOptions> {
return '(${field.type.baseName})(std::get<int32_t>($encodable))';
} else if (field.type.baseName == 'int') {
return '$encodable.LongValue()';
} else if (field.type.baseName == 'Object') {
return encodable;
} else {
final HostDatatype hostDatatype = getFieldHostDatatype(field,
root.classes, root.enums, _shortBaseCppTypeForBuiltinDartType);
Expand All @@ -669,8 +671,6 @@ class CppSourceGenerator extends StructuredGenerator<CppOptions> {
.map((Class x) => x.name)
.contains(field.type.baseName)) {
return '${hostDatatype.datatype}::FromEncodableList(std::get<EncodableList>($encodable))';
} else if (field.type.baseName == 'Object') {
return encodable;
} else {
return 'std::get<${hostDatatype.datatype}>($encodable)';
}
Expand Down
6 changes: 3 additions & 3 deletions packages/pigeon/lib/dart_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class DartGenerator extends StructuredGenerator<DartOptions> {
) {
void writeValueDecode(NamedType field, int index) {
final String resultAt = 'result[$index]';
String castCallPrefix = field.type.isNullable ? '?' : '!';
final String castCallPrefix = field.type.isNullable ? '?' : '!';
final String genericType = _makeGenericTypeArguments(field.type);
final String castCall = _makeGenericCastCall(field.type);
final String nullableTag = field.type.isNullable ? '?' : '';
Expand Down Expand Up @@ -235,13 +235,13 @@ $resultAt != null
'($resultAt as $genericType?)$castCallPrefix$castCall',
);
} else {
castCallPrefix = field.type.isNullable ? '' : '!';
final String castCallForcePrefix = field.type.isNullable ? '' : '!';
final String castString = field.type.baseName == 'Object'
? ''
: ' as $genericType$nullableTag';

indent.add(
'$resultAt$castCallPrefix$castString',
'$resultAt$castCallForcePrefix$castString',
);
}
}
Expand Down