[Rust] Capture types by ref name when applicable. Issue #496.

Author: mjpt777

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

@@ -312,22 +312,27 @@ private void captureTypes(final List<Token> tokens, final int beginIndex, final
             switch (token.signal())
             {
                 case BEGIN_COMPOSITE:
-                    i = captureType(tokens, i, Signal.END_COMPOSITE, token.name());
+                    i = captureType(tokens, i, Signal.END_COMPOSITE, token.name(), token.referencedName());
                     captureTypes(tokens, typeBeginIndex + 1, i - 1);
                     break;
 
                 case BEGIN_ENUM:
-                    i = captureType(tokens, i, Signal.END_ENUM, token.name());
+                    i = captureType(tokens, i, Signal.END_ENUM, token.name(), token.referencedName());
                     break;
 
                 case BEGIN_SET:
-                    i = captureType(tokens, i, Signal.END_SET, token.name());
+                    i = captureType(tokens, i, Signal.END_SET, token.name(), token.referencedName());
                     break;
             }
         }
     }
 
-    private int captureType(final List<Token> tokens, final int index, final Signal endSignal, final String name)
+    private int captureType(
+        final List<Token> tokens,
+        final int index,
+        final Signal endSignal,
+        final String name,
+        final String referencedName)
     {
         final List<Token> typeTokens = new ArrayList<>();
 
@@ -342,7 +347,15 @@ 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);
+
+        if (null == referencedName)
+        {
+            typesByNameMap.put(name, typeTokens);
+        }
+        else
+        {
+            typesByNameMap.put(referencedName, typeTokens);
+        }
 
         return i;
     }

sbe-tool/src/test/java/uk/co/real_logic/sbe/ir/CompositeRefsTest.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package uk.co.real_logic.sbe.ir;
+
+import org.junit.Test;
+import uk.co.real_logic.sbe.xml.IrGenerator;
+import uk.co.real_logic.sbe.xml.MessageSchema;
+import uk.co.real_logic.sbe.xml.ParserOptions;
+
+import static org.junit.Assert.assertNotNull;
+import static uk.co.real_logic.sbe.TestUtil.getLocalResource;
+import static uk.co.real_logic.sbe.xml.XmlSchemaParser.parse;
+
+public class CompositeRefsTest
+{
+    @Test
+    public void shouldGenerateCorrectIrForCompositeRefs()
+        throws Exception
+    {
+        final MessageSchema schema = parse(getLocalResource("issue496.xml"), ParserOptions.DEFAULT);
+        final IrGenerator irg = new IrGenerator();
+        final Ir ir = irg.generate(schema);
+
+        assertNotNull(ir.getType("compositeOne"));
+        assertNotNull(ir.getType("compositeTwo"));
+        assertNotNull(ir.getType("compositeThree"));
+    }
+}

sbe-tool/src/test/resources/issue496.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<sbe:messageSchema xmlns:sbe="http://fixprotocol.io/2016/sbe"
+                   package="issue488"
+                   id="488"
+                   version="0"
+                   semanticVersion="1.0"
+                   description="issue 488 test case"
+                   byteOrder="bigEndian">
+    <types>
+        <composite name="messageHeader" description="header">
+            <type name="blockLength" primitiveType="uint16"/>
+            <type name="templateId" primitiveType="uint16"/>
+            <type name="schemaId" primitiveType="uint16"/>
+            <type name="version" primitiveType="uint16"/>
+        </composite>
+
+        <type name="string10" length="10" primitiveType="char"/>
+
+        <composite name="compositeThree">
+            <ref name="field1" type="string10"/>
+        </composite>
+
+        <composite name="compositeTwo">
+            <ref name="compFieldTwo" type="string10"/>
+            <ref name="compThree" type="compositeThree"/>
+        </composite>
+
+        <composite name="compositeOne">
+            <ref name="compFieldOne" type="string10"/>
+            <ref name="compTwo" type="compositeTwo"/>
+        </composite>
+    </types>
+
+    <sbe:message name="SomeMessage" id="1">
+        <field name="id" id="1" type="int64"/>
+        <field name="comp" id="2" type="compositeOne"/>
+    </sbe:message>
+</sbe:messageSchema>