[Java] Use componentTokenCount rather than scanning forward.

mjpt777 · mjpt777 · commit 6507c1849fc4 · 2016-07-06T12:19:16.000+01:00
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
@@ -1022,7 +1022,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
 
                     case BEGIN_COMPOSITE:
                         out.append(generateCompositeProperty(propertyName, encodingToken, BASE_INDENT, typeName));
-                        i = findEndSignal(tokens, i, Signal.END_COMPOSITE, encodingToken.name());
+                        i += encodingToken.componentTokenCount();
                         break;
                 }
             }
@@ -1059,7 +1059,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
 
                     case BEGIN_COMPOSITE:
                         out.append(generateCompositeProperty(propertyName, encodingToken, BASE_INDENT, typeName));
-                        i = findEndSignal(tokens, i, Signal.END_COMPOSITE, encodingToken.name());
+                        i += encodingToken.componentTokenCount();
                         break;
                 }
             }
@@ -2388,7 +2388,7 @@ private CharSequence generateCompositeDecoderDisplay(final List<Token> tokens, f
             writeTokenDisplay(propertyName, encodingToken, sb, indent + INDENT);
             if (encodingToken.signal() == Signal.BEGIN_COMPOSITE)
             {
-                i = findEndSignal(tokens, i, Signal.END_COMPOSITE, encodingToken.name());
+                i += encodingToken.componentTokenCount();
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1022,7 +1022,7 @@ private void generateComposite(final List<Token> tokens) throws IOException`
`1022`	`1022`
`1023`	`1023`	`case BEGIN_COMPOSITE:`
`1024`	`1024`	`out.append(generateCompositeProperty(propertyName, encodingToken, BASE_INDENT, typeName));`
`1025`		`- i = findEndSignal(tokens, i, Signal.END_COMPOSITE, encodingToken.name());`
	`1025`	`+ i += encodingToken.componentTokenCount();`
`1026`	`1026`	`break;`
`1027`	`1027`	`}`
`1028`	`1028`	`}`
`@@ -1059,7 +1059,7 @@ private void generateComposite(final List<Token> tokens) throws IOException`
`1059`	`1059`
`1060`	`1060`	`case BEGIN_COMPOSITE:`
`1061`	`1061`	`out.append(generateCompositeProperty(propertyName, encodingToken, BASE_INDENT, typeName));`
`1062`		`- i = findEndSignal(tokens, i, Signal.END_COMPOSITE, encodingToken.name());`
	`1062`	`+ i += encodingToken.componentTokenCount();`
`1063`	`1063`	`break;`
`1064`	`1064`	`}`
`1065`	`1065`	`}`
`@@ -2388,7 +2388,7 @@ private CharSequence generateCompositeDecoderDisplay(final List<Token> tokens, f`
`2388`	`2388`	`writeTokenDisplay(propertyName, encodingToken, sb, indent + INDENT);`
`2389`	`2389`	`if (encodingToken.signal() == Signal.BEGIN_COMPOSITE)`
`2390`	`2390`	`{`
`2391`		`- i = findEndSignal(tokens, i, Signal.END_COMPOSITE, encodingToken.name());`
	`2391`	`+ i += encodingToken.componentTokenCount();`
`2392`	`2392`	`}`
`2393`	`2393`	`}`
`2394`	`2394`