@@ -338,6 +338,16 @@ class GObjectHeaderGenerator
338338 indent.newln ();
339339 _writeDeclareFinalType (indent, module, _codecBaseName,
340340 parentClassName: _standardCodecName);
341+
342+ final Iterable <EnumeratedType > customTypes =
343+ getEnumeratedTypes (root, excludeSealedClasses: true );
344+
345+ for (final EnumeratedType customType in customTypes) {
346+ final String customTypeId = _getCustomTypeId (module, customType);
347+ indent.newln ();
348+ indent
349+ .writeln ('const uint8_t $customTypeId = ${customType .enumeration };' );
350+ }
341351 }
342352
343353 @override
@@ -1023,14 +1033,15 @@ class GObjectSourceGenerator
10231033 final String customTypeName = _getClassName (module, customType.name);
10241034 final String snakeCustomTypeName =
10251035 _snakeCaseFromCamelCase (customTypeName);
1036+ final String customTypeId = _getCustomTypeId (module, customType);
10261037 indent.newln ();
10271038 final String valueType = customType.type == CustomTypes .customClass
10281039 ? '$customTypeName *'
10291040 : 'FlValue*' ;
10301041 indent.writeScoped (
10311042 'static gboolean ${codecMethodPrefix }_write_$snakeCustomTypeName ($_standardCodecName * codec, GByteArray* buffer, $valueType value, GError** error) {' ,
10321043 '}' , () {
1033- indent.writeln ('uint8_t type = ${ customType . enumeration } ;' );
1044+ indent.writeln ('uint8_t type = $customTypeId ;' );
10341045 indent.writeln ('g_byte_array_append(buffer, &type, sizeof(uint8_t));' );
10351046 if (customType.type == CustomTypes .customClass) {
10361047 indent.writeln (
@@ -1053,7 +1064,8 @@ class GObjectSourceGenerator
10531064 indent.writeScoped ('switch (fl_value_get_custom_type(value)) {' , '}' ,
10541065 () {
10551066 for (final EnumeratedType customType in customTypes) {
1056- indent.writeln ('case ${customType .enumeration }:' );
1067+ final String customTypeId = _getCustomTypeId (module, customType);
1068+ indent.writeln ('case $customTypeId :' );
10571069 indent.nest (1 , () {
10581070 final String customTypeName =
10591071 _getClassName (module, customType.name);
@@ -1082,6 +1094,7 @@ class GObjectSourceGenerator
10821094 final String customTypeName = _getClassName (module, customType.name);
10831095 final String snakeCustomTypeName =
10841096 _snakeCaseFromCamelCase (customTypeName);
1097+ final String customTypeId = _getCustomTypeId (module, customType);
10851098 indent.newln ();
10861099 indent.writeScoped (
10871100 'static FlValue* ${codecMethodPrefix }_read_$snakeCustomTypeName ($_standardCodecName * codec, GBytes* buffer, size_t* offset, GError** error) {' ,
@@ -1102,10 +1115,10 @@ class GObjectSourceGenerator
11021115 });
11031116 indent.newln ();
11041117 indent.writeln (
1105- 'return fl_value_new_custom_object(${ customType . enumeration } , G_OBJECT(value));' );
1118+ 'return fl_value_new_custom_object($customTypeId , G_OBJECT(value));' );
11061119 } else if (customType.type == CustomTypes .customEnum) {
11071120 indent.writeln (
1108- 'return fl_value_new_custom(${ customType . enumeration } , fl_standard_message_codec_read_value(codec, buffer, offset, error), (GDestroyNotify)fl_value_unref);' );
1121+ 'return fl_value_new_custom($customTypeId , fl_standard_message_codec_read_value(codec, buffer, offset, error), (GDestroyNotify)fl_value_unref);' );
11091122 }
11101123 });
11111124 }
@@ -1117,9 +1130,10 @@ class GObjectSourceGenerator
11171130 indent.writeScoped ('switch (type) {' , '}' , () {
11181131 for (final EnumeratedType customType in customTypes) {
11191132 final String customTypeName = _getClassName (module, customType.name);
1133+ final String customTypeId = _getCustomTypeId (module, customType);
11201134 final String snakeCustomTypeName =
11211135 _snakeCaseFromCamelCase (customTypeName);
1122- indent.writeln ('case ${ customType . enumeration } :' );
1136+ indent.writeln ('case $customTypeId :' );
11231137 indent.nest (1 , () {
11241138 indent.writeln (
11251139 'return ${codecMethodPrefix }_read_$snakeCustomTypeName (codec, buffer, offset, error);' );
@@ -1922,6 +1936,16 @@ String _getMethodPrefix(String module, String name) {
19221936 return _snakeCaseFromCamelCase (className);
19231937}
19241938
1939+ // Returns the code for the custom type id definition for [customType].
1940+ String _getCustomTypeId (String module, EnumeratedType customType) {
1941+ final String customTypeName = _getClassName (module, customType.name);
1942+
1943+ final String snakeCustomTypeName = _snakeCaseFromCamelCase (customTypeName);
1944+
1945+ final String customTypeId = '${snakeCustomTypeName }_type_id' ;
1946+ return customTypeId;
1947+ }
1948+
19251949// Returns an enumeration value in C++ form.
19261950String _getEnumValue (String module, String enumName, String memberName) {
19271951 final String snakeEnumName = _snakeCaseFromCamelCase (enumName);
@@ -2062,12 +2086,14 @@ String _referenceValue(String module, TypeDeclaration type, String variableName,
20622086 }
20632087}
20642088
2065- int _getTypeEnumeration (Root root, TypeDeclaration type) {
2066- return getEnumeratedTypes (root, excludeSealedClasses: true )
2067- .firstWhere ((EnumeratedType t) =>
2068- (type.isClass && t.associatedClass == type.associatedClass) ||
2069- (type.isEnum && t.associatedEnum == type.associatedEnum))
2070- .enumeration;
2089+ String _getCustomTypeIdFromDeclaration (
2090+ Root root, TypeDeclaration type, String module) {
2091+ return _getCustomTypeId (
2092+ module,
2093+ getEnumeratedTypes (root, excludeSealedClasses: true ).firstWhere (
2094+ (EnumeratedType t) =>
2095+ (type.isClass && t.associatedClass == type.associatedClass) ||
2096+ (type.isEnum && t.associatedEnum == type.associatedEnum)));
20712097}
20722098
20732099// Returns code to convert the native data type stored in [variableName] to a FlValue.
@@ -2078,12 +2104,15 @@ String _makeFlValue(
20782104 {String ? lengthVariableName}) {
20792105 final String value;
20802106 if (type.isClass) {
2081- final int enumeration = _getTypeEnumeration (root, type);
2082- value = 'fl_value_new_custom_object($enumeration , G_OBJECT($variableName ))' ;
2107+ final String customTypeId =
2108+ _getCustomTypeIdFromDeclaration (root, type, module);
2109+ value =
2110+ 'fl_value_new_custom_object($customTypeId , G_OBJECT($variableName ))' ;
20832111 } else if (type.isEnum) {
2084- final int enumeration = _getTypeEnumeration (root, type);
2112+ final String customTypeId =
2113+ _getCustomTypeIdFromDeclaration (root, type, module);
20852114 value =
2086- 'fl_value_new_custom($enumeration , fl_value_new_int(${type .isNullable ? '*$variableName ' : variableName }), (GDestroyNotify)fl_value_unref)' ;
2115+ 'fl_value_new_custom($customTypeId , fl_value_new_int(${type .isNullable ? '*$variableName ' : variableName }), (GDestroyNotify)fl_value_unref)' ;
20872116 } else if (_isFlValueWrappedType (type)) {
20882117 value = 'fl_value_ref($variableName )' ;
20892118 } else if (type.baseName == 'void' ) {
0 commit comments