@@ -217,10 +217,8 @@ private static void generateGroupStruct(
217217 final  List <Token > tokens ,
218218 final  int  index )
219219 {
220-  final  String  dimensionsStructName  = formatScopedName (scope , tokens .get (index  + 1 ).name ());
221- 
222220 sb .append (String .format ("\n "  +
223-  "struct %1$ s\n "  +
221+  "struct %s\n "  +
224222 "{\n "  +
225223 " char *buffer;\n "  +
226224 " uint64_t buffer_length;\n "  +
@@ -230,9 +228,8 @@ private static void generateGroupStruct(
230228 " uint64_t index;\n "  +
231229 " uint64_t offset;\n "  +
232230 " uint64_t acting_version;\n "  +
233-  " struct %2$s dimensions;\n "  +
234231 "};\n " ,
235-  groupName ,  dimensionsStructName ));
232+  groupName ));
236233 }
237234
238235 private  static  void  generateGroupHeaderFunctions (
@@ -265,12 +262,13 @@ private static void generateGroupHeaderFunctions(
265262 "{\n "  +
266263 " codec->buffer = buffer;\n "  +
267264 " 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 "  +
269267 " {\n "  +
270268 " return NULL;\n "  +
271269 " }\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 "  +
274272 " codec->index = -1;\n "  +
275273 " codec->acting_version = acting_version;\n "  +
276274 " codec->position_ptr = pos;\n "  +
@@ -305,12 +303,13 @@ private static void generateGroupHeaderFunctions(
305303 "#endif\n "  +
306304 " codec->buffer = buffer;\n "  +
307305 " 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 "  +
309308 " {\n "  +
310309 " return NULL;\n "  +
311310 " }\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 "  +
314313 " codec->index = -1;\n "  +
315314 " codec->count = count;\n "  +
316315 " codec->block_length = %3$d;\n "  +
0 commit comments