@@ -217,10 +217,8 @@ private static void generateGroupStruct(
217
217
final List <Token > tokens ,
218
218
final int index )
219
219
{
220
- final String dimensionsStructName = formatScopedName (scope , tokens .get (index + 1 ).name ());
221
-
222
220
sb .append (String .format ("\n " +
223
- "struct %1$ s\n " +
221
+ "struct %s\n " +
224
222
"{\n " +
225
223
" char *buffer;\n " +
226
224
" uint64_t buffer_length;\n " +
@@ -230,9 +228,8 @@ private static void generateGroupStruct(
230
228
" uint64_t index;\n " +
231
229
" uint64_t offset;\n " +
232
230
" uint64_t acting_version;\n " +
233
- " struct %2$s dimensions;\n " +
234
231
"};\n " ,
235
- groupName , dimensionsStructName ));
232
+ groupName ));
236
233
}
237
234
238
235
private static void generateGroupHeaderFunctions (
@@ -265,12 +262,13 @@ private static void generateGroupHeaderFunctions(
265
262
"{\n " +
266
263
" codec->buffer = buffer;\n " +
267
264
" codec->buffer_length = buffer_length;\n " +
268
- " if (!%2$s_wrap(&codec->dimensions, codec->buffer, *pos, acting_version, buffer_length))\n " +
265
+ " struct %2$s dimensions;\n " +
266
+ " if (!%2$s_wrap(&dimensions, codec->buffer, *pos, acting_version, buffer_length))\n " +
269
267
" {\n " +
270
268
" return NULL;\n " +
271
269
" }\n " +
272
- " codec->block_length = %2$s_blockLength(&codec-> dimensions);\n " +
273
- " codec->count = %2$s_numInGroup(&codec-> dimensions);\n " +
270
+ " codec->block_length = %2$s_blockLength(&dimensions);\n " +
271
+ " codec->count = %2$s_numInGroup(&dimensions);\n " +
274
272
" codec->index = -1;\n " +
275
273
" codec->acting_version = acting_version;\n " +
276
274
" codec->position_ptr = pos;\n " +
@@ -305,12 +303,13 @@ private static void generateGroupHeaderFunctions(
305
303
"#endif\n " +
306
304
" codec->buffer = buffer;\n " +
307
305
" codec->buffer_length = buffer_length;\n " +
308
- " if (!%5$s_wrap(&codec->dimensions, codec->buffer, *pos, acting_version, buffer_length))\n " +
306
+ " struct %5$s dimensions;\n " +
307
+ " if (!%5$s_wrap(&dimensions, codec->buffer, *pos, acting_version, buffer_length))\n " +
309
308
" {\n " +
310
309
" return NULL;\n " +
311
310
" }\n " +
312
- " %5$s_set_blockLength(&codec-> dimensions, (%2$s)%3$d);\n " +
313
- " %5$s_set_numInGroup(&codec-> dimensions, (%4$s)count);\n " +
311
+ " %5$s_set_blockLength(&dimensions, (%2$s)%3$d);\n " +
312
+ " %5$s_set_numInGroup(&dimensions, (%4$s)count);\n " +
314
313
" codec->index = -1;\n " +
315
314
" codec->count = count;\n " +
316
315
" codec->block_length = %3$d;\n " +
0 commit comments