[Java] Update component token counts for types as well as messages.

Author: mjpt777

sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/Ir.java

@@ -107,7 +107,7 @@ public void addMessage(final long messageId, final List<Token> messageTokens)
 
  captureTypes(messageTokens, 0, messageTokens.size() - 1);
  compressConstantEnums(messageTokens);
- countComponentTokens(messageTokens);
+ updateComponentTokenCounts(messageTokens);
 
  messagesByIdMap.put(messageId, new ArrayList<>(messageTokens));
  }
@@ -236,6 +236,37 @@ public String applicableNamespace()
  return namespaceName == null ? packageName : namespaceName;
  }
 
+ /**
+ * Iterate over a list of {@link Token}s and update their counts of how many tokens make up each component.
+ *
+ * @param tokens not be updated.
+ */
+ public static void updateComponentTokenCounts(final List<Token> tokens)
+ {
+ final Map<String, Deque<Integer>> map = new HashMap<>();
+
+ for (int i = 0, size = tokens.size(); i < size; i++)
+ {
+ final Token token = tokens.get(i);
+ final Signal signal = token.signal();
+
+ if (signal.name().startsWith("BEGIN_"))
+ {
+ final String componentType = signal.name().substring(6);
+ map.computeIfAbsent(componentType, (key) -> new LinkedList<>()).push(i);
+ }
+ else if (signal.name().startsWith("END_"))
+ {
+ final String componentType = signal.name().substring(4);
+ final int beginIndex = map.get(componentType).pop();
+
+ final int componentTokenCount = (i - beginIndex) + 1;
+ tokens.get(beginIndex).componentTokenCount(componentTokenCount);
+ token.componentTokenCount(componentTokenCount);
+ }
+ }
+ }
+
  private static void compressConstantEnums(final List<Token> tokens)
  {
  final Iterator<Token> iter = tokens.iterator();
@@ -271,32 +302,6 @@ private static void compressConstantEnums(final List<Token> tokens)
  }
  }
 
- private static void countComponentTokens(final List<Token> tokens)
- {
- final Map<String, Deque<Integer>> map = new HashMap<>();
-
- for (int i = 0, size = tokens.size(); i < size; i++)
- {
- final Token token = tokens.get(i);
- final Signal signal = token.signal();
-
- if (signal.name().startsWith("BEGIN_"))
- {
- final String componentType = signal.name().substring(6);
- map.computeIfAbsent(componentType, (key) -> new LinkedList<>()).push(i);
- }
- else if (signal.name().startsWith("END_"))
- {
- final String componentType = signal.name().substring(4);
- final int beginIndex = map.get(componentType).pop();
-
- final int componentTokenCount = (i - beginIndex) + 1;
- tokens.get(beginIndex).componentTokenCount(componentTokenCount);
- token.componentTokenCount(componentTokenCount);
- }
- }
- }
-
  private void captureTypes(final List<Token> tokens, final int beginIndex, final int endIndex)
  {
  for (int i = beginIndex; i <= endIndex; i++)
@@ -336,6 +341,8 @@ private int captureType(final List<Token> tokens, final int index, final Signal
  }
  while (endSignal != token.signal() || !name.equals(token.name()));
 
+
+ updateComponentTokenCounts(typeTokens);
  typesByNameMap.put(name, typeTokens);
 
  return i;