[Java] Added the ability to collect groups that may contain var data.

mjpt777 · mjpt777 · commit 4c39de820b25 · 2015-12-10T15:50:49.000Z
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/GenerationUtil.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/GenerationUtil.java
@@ -47,20 +47,33 @@ public static int collectRootFields(final List<Token> tokens, int index, final L
         return index;
     }
 
-    public static int collectGroups(final List<Token> tokens, int index, final List<Token> groups)
+    public static int collectGroups(final List<Token> tokens, final int index, final List<Token> groups)
     {
-        for (int size = tokens.size(); index < size; index++)
+        int groupStart = -1;
+        int groupEnd = index;
+        for (int i = index, size = tokens.size(); i < size; i++)
         {
-            final Token token = tokens.get(index);
-            if (Signal.BEGIN_VAR_DATA == token.signal())
+            final Token token = tokens.get(i);
+            if (Signal.BEGIN_GROUP == token.signal() && -1 == groupStart)
             {
-                return index;
+                groupStart = i;
             }
 
-            groups.add(token);
+            if (Signal.END_GROUP == token.signal())
+            {
+                groupEnd = i;
+            }
         }
 
-        return index;
+        if (groupStart > -1)
+        {
+            for (int i = groupStart; i <= groupEnd; i++)
+            {
+                groups.add(tokens.get(i));
+            }
+        }
+
+        return groupEnd;
     }
 
     public static List<Token> getMessageBody(final List<Token> tokens)

Original file line number	Diff line number	Diff line change
`@@ -47,20 +47,33 @@ public static int collectRootFields(final List<Token> tokens, int index, final L`
`47`	`47`	`return index;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public static int collectGroups(final List<Token> tokens, int index, final List<Token> groups)`
	`50`	`+ public static int collectGroups(final List<Token> tokens, final int index, final List<Token> groups)`
`51`	`51`	`{`
`52`		`- for (int size = tokens.size(); index < size; index++)`
	`52`	`+ int groupStart = -1;`
	`53`	`+ int groupEnd = index;`
	`54`	`+ for (int i = index, size = tokens.size(); i < size; i++)`
`53`	`55`	`{`
`54`		`- final Token token = tokens.get(index);`
`55`		`- if (Signal.BEGIN_VAR_DATA == token.signal())`
	`56`	`+ final Token token = tokens.get(i);`
	`57`	`+ if (Signal.BEGIN_GROUP == token.signal() && -1 == groupStart)`
`56`	`58`	`{`
`57`		`- return index;`
	`59`	`+ groupStart = i;`
`58`	`60`	`}`
`59`	`61`
`60`		`- groups.add(token);`
	`62`	`+ if (Signal.END_GROUP == token.signal())`
	`63`	`+ {`
	`64`	`+ groupEnd = i;`
	`65`	`+ }`
`61`	`66`	`}`
`62`	`67`
`63`		`- return index;`
	`68`	`+ if (groupStart > -1)`
	`69`	`+ {`
	`70`	`+ for (int i = groupStart; i <= groupEnd; i++)`
	`71`	`+ {`
	`72`	`+ groups.add(tokens.get(i));`
	`73`	`+ }`
	`74`	`+ }`
	`75`	`+`
	`76`	`+ return groupEnd;`
`64`	`77`	`}`
`65`	`78`
`66`	`79`	`public static List<Token> getMessageBody(final List<Token> tokens)`