Merge branch 'master' of https://github.com/real-logic/simple-binary-encoding

Author: tmontgomery

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

@@ -85,10 +85,43 @@ public void addMessage(final long messageId, final List<Token> messageTokens)
  Verify.notNull(messageTokens, "messageTokens");
 
  captureTypes(messageTokens);
+ compressConstantEnums(messageTokens);
 
  messagesByIdMap.put(messageId, Collections.unmodifiableList(new ArrayList<>(messageTokens)));
  }
 
+ private void compressConstantEnums(final List<Token> tokens)
+ {
+ final Iterator<Token> iter = tokens.iterator();
+ while (iter.hasNext())
+ {
+ final Token token = iter.next();
+ if (Signal.BEGIN_FIELD == token.signal() && token.isConstantEncoding())
+ {
+ Token nextToken = iter.next();
+ if (Signal.BEGIN_ENUM == nextToken.signal())
+ {
+ final String valueRef = token.encoding().constValue().toString();
+ nextToken.encodedLength(0);
+
+ while (true)
+ {
+ nextToken = iter.next();
+ if (Signal.END_ENUM == nextToken.signal())
+ {
+ break;
+ }
+
+ if (!valueRef.endsWith(nextToken.name()))
+ {
+ iter.remove();
+ }
+ }
+ }
+ }
+ }
+ }
+
  /**
  * Get the getMessage for a given identifier.
  *

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

@@ -100,7 +100,7 @@ public enum VersionContext
  private final String name;
  private final int id;
  private final int version;
- private final int encodedLength;
+ private int encodedLength;
  private final int offset;
  private final Encoding encoding;
 
@@ -206,6 +206,16 @@ public int encodedLength()
  return encodedLength;
  }
 
+ /**
+ * Set the encoded length for this node. See {@link #encodedLength()}.
+ *
+ * @param encodedLength that is overriding existing value.
+ */
+ public void encodedLength(final int encodedLength)
+ {
+ this.encodedLength = encodedLength;
+ }
+
  /**
  * The number of encoded primitives in this type.
  *

sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/IrGenerator.java

@@ -15,11 +15,13 @@
 package uk.co.real_logic.sbe.xml;
 
 import uk.co.real_logic.sbe.PrimitiveType;
+import uk.co.real_logic.sbe.PrimitiveValue;
 import uk.co.real_logic.sbe.ir.Encoding;
 import uk.co.real_logic.sbe.ir.Ir;
 import uk.co.real_logic.sbe.ir.Signal;
 import uk.co.real_logic.sbe.ir.Token;
 
+import java.io.UnsupportedEncodingException;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.List;
@@ -108,18 +110,37 @@ private void addMessageSignal(final Message msg, final Signal signal)
 
  private void addFieldSignal(final Field field, final Signal signal)
  {
+ final Encoding.Builder encodingBuilder = new Encoding.Builder()
+ .epoch(field.epoch())
+ .timeUnit(field.timeUnit())
+ .presence(convertPresence(field.presence()))
+ .semanticType(semanticTypeOf(null, field));
+
+ if (field.presence() == Presence.CONSTANT && null != field.valueRef())
+ {
+ final String valueRef = field.valueRef();
+ final byte[] bytes;
+ try
+ {
+ bytes = valueRef.getBytes("UTF-8");
+ }
+ catch (final UnsupportedEncodingException ex)
+ {
+ throw new RuntimeException(ex);
+ }
+
+ encodingBuilder.constValue(new PrimitiveValue(bytes, "UTF-8", valueRef.length()));
+ encodingBuilder.primitiveType(PrimitiveType.CHAR);
+ }
+
  final Token token = new Token.Builder()
  .signal(signal)
  .size(field.computedBlockLength())
  .name(field.name())
  .id(field.id())
  .offset(field.computedOffset())
  .version(field.sinceVersion())
- .encoding(new Encoding.Builder()
- .epoch(field.epoch())
- .timeUnit(field.timeUnit())
- .semanticType(semanticTypeOf(null, field))
- .build())
+ .encoding(encodingBuilder.build())
  .build();
 
  tokenList.add(token);
@@ -377,4 +398,25 @@ private String semanticTypeOf(final Type type, final Field field)
 
  return null != field ? field.semanticType() : null;
  }
+
+ private Encoding.Presence convertPresence(final Presence presence)
+ {
+ Encoding.Presence encodingPresence = Encoding.Presence.REQUIRED;
+
+ if (null != presence)
+ {
+ switch (presence)
+ {
+ case OPTIONAL:
+ encodingPresence = Encoding.Presence.OPTIONAL;
+ break;
+
+ case CONSTANT:
+ encodingPresence = Encoding.Presence.CONSTANT;
+ break;
+ }
+ }
+
+ return encodingPresence;
+ }
 }

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/JavaGeneratorTest.java

@@ -459,6 +459,10 @@ private Class<?> compile(final String fqClassName) throws Exception
  System.out.println(sources);
  }
 
+ if (fqClassName.contains("Model"))
+ {
+ System.out.println("sources = " + sources.get(fqClassName));
+ }
  return aClass;
  }