[Java] Update token index after collecting var data tokens in generate groups for CppGenerator.

Author: mjpt777

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java

@@ -129,16 +129,16 @@ public void generate() throws IOException
  out.append(generateMessageFlyweightCode(className, msgToken));
 
  final List<Token> messageBody = tokens.subList(1, tokens.size() - 1);
- int index = 0;
+ int i = 0;
 
  final List<Token> fields = new ArrayList<>();
- index = collectFields(messageBody, index, fields);
+ i = collectFields(messageBody, i, fields);
 
  final List<Token> groups = new ArrayList<>();
- index = collectGroups(messageBody, index, groups);
+ i = collectGroups(messageBody, i, groups);
 
  final List<Token> varData = new ArrayList<>();
- collectVarData(messageBody, index, varData);
+ collectVarData(messageBody, i, varData);
 
  final StringBuilder sb = new StringBuilder();
  out.append(generateFields(className, fields, BASE_INDENT));
@@ -179,7 +179,7 @@ private void generateGroups(final StringBuilder sb, final List<Token> tokens, fi
  generateGroups(sb, groups, indent + INDENT);
 
  final List<Token> varData = new ArrayList<>();
- collectVarData(tokens, i, varData);
+ i = collectVarData(tokens, i, varData);
  sb.append(generateVarData(formatClassName(groupName), varData, indent + INDENT));
 
  sb.append(indent).append(" };\n");

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java

@@ -157,15 +157,15 @@ public void generate() throws IOException
  final Token msgToken = tokens.get(0);
  final List<Token> messageBody = getMessageBody(tokens);
 
- int index = 0;
+ int i = 0;
  final List<Token> fields = new ArrayList<>();
- index = collectFields(messageBody, index, fields);
+ i = collectFields(messageBody, i, fields);
 
  final List<Token> groups = new ArrayList<>();
- index = collectGroups(messageBody, index, groups);
+ i = collectGroups(messageBody, i, groups);
 
  final List<Token> varData = new ArrayList<>();
- collectVarData(messageBody, index, varData);
+ collectVarData(messageBody, i, varData);
 
  generateDecoder(BASE_INDENT, fields, groups, varData, msgToken);
  generateEncoder(BASE_INDENT, fields, groups, varData, msgToken);