[C++ OTF]: refactor retrieval of presence.

Author: Todd L. Montgomery

main/cpp/otf_api/Field.h

@@ -281,49 +281,49 @@ class Field
  }
 
  Field &addEncoding(const std::string &name, const Ir::TokenPrimitiveType type,
- const int64_t value, const Ir::TokenPresence presence = Ir::REQUIRED)
+ const int64_t value, const Ir *ir)
  {
  encodingNames_.push_back(name);
  primitiveTypes_.push_back(type);
  encodingValues_.push_back(EncodingValue(value));
  encodingLengths_.push_back(1);
- presence_.push_back(presence);
+ presence_.push_back(ir->presence());
  numEncodings_++;
  return *this;
  }
 
  Field &addEncoding(const std::string &name, const Ir::TokenPrimitiveType type,
- const uint64_t value, const Ir::TokenPresence presence = Ir::REQUIRED)
+ const uint64_t value, const Ir *ir)
  {
  encodingNames_.push_back(name);
  primitiveTypes_.push_back(type);
  encodingValues_.push_back(EncodingValue(value));
  encodingLengths_.push_back(1);
- presence_.push_back(presence);
+ presence_.push_back(ir->presence());
  numEncodings_++;
  return *this; 
  }
 
  Field &addEncoding(const std::string &name, const Ir::TokenPrimitiveType type,
- const double value, const Ir::TokenPresence presence = Ir::REQUIRED)
+ const double value, const Ir *ir)
  {
  encodingNames_.push_back(name);
  primitiveTypes_.push_back(type);
  encodingValues_.push_back(EncodingValue(value));
  encodingLengths_.push_back(1);
- presence_.push_back(presence);
+ presence_.push_back(ir->presence());
  numEncodings_++;
  return *this;
  }
 
  Field &addEncoding(const std::string &name, const Ir::TokenPrimitiveType type,
- const char *array, const int size, const Ir::TokenPresence presence = Ir::REQUIRED)
+ const char *array, const int size, const Ir *ir)
  {
  encodingNames_.push_back(name);
  primitiveTypes_.push_back(type);
  encodingValues_.push_back(EncodingValue(array));
  encodingLengths_.push_back(size / Ir::size(type));
- presence_.push_back(presence);
+ presence_.push_back(ir->presence());
  numEncodings_++;
  return *this;
  }

main/cpp/otf_api/Listener.cpp

@@ -452,14 +452,14 @@ void Listener::processEndField(void)
 uint64_t Listener::processBeginEnum(const Ir *ir, const char value)
 {
  cachedField_.type(Field::ENUM)
- .addEncoding(ir->name(), ir->primitiveType(), (uint64_t)value);
+ .addEncoding(ir->name(), ir->primitiveType(), (uint64_t)value, ir);
  return ir->size();
 }
 
 uint64_t Listener::processBeginEnum(const Ir *ir, uint8_t value)
 {
  cachedField_.type(Field::ENUM)
- .addEncoding(ir->name(), ir->primitiveType(), (uint64_t)value);
+ .addEncoding(ir->name(), ir->primitiveType(), (uint64_t)value, ir);
  return ir->size();
 }
 
@@ -480,7 +480,7 @@ void Listener::processEndEnum(void)
 uint64_t Listener::processBeginSet(const Ir *ir, const uint64_t value)
 {
  cachedField_.type(Field::SET)
- .addEncoding(ir->name(), ir->primitiveType(), value);
+ .addEncoding(ir->name(), ir->primitiveType(), value, ir);
  return ir->size();
 }
 
@@ -512,13 +512,13 @@ void Listener::processEndVarData(void)
 
 uint64_t Listener::processEncoding(const Ir *ir, const int64_t value)
 {
- cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, ir->presence());
+ cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, ir);
  return ir->size();
 }
 
 uint64_t Listener::processEncoding(const Ir *ir, const uint64_t value)
 {
- cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, ir->presence());
+ cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, ir);
 
  //printf("encoding %s %d %u\n", ir->name().c_str(), ir->primitiveType(), value);
 
@@ -554,7 +554,7 @@ uint64_t Listener::processEncoding(const Ir *ir, const uint64_t value)
 
 uint64_t Listener::processEncoding(const Ir *ir, const double value)
 {
- cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, ir->presence());
+ cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, ir);
  return ir->size();
 }
 
@@ -563,12 +563,12 @@ uint64_t Listener::processEncoding(const Ir *ir, const char *value, const int si
  // arrays and variable length fields both come through here
  if (cachedField_.type() == Field::VAR_DATA)
  {
- cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, cachedField_.varDataLength(), ir->presence());
+ cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, cachedField_.varDataLength(), ir);
  return cachedField_.varDataLength();
  }
  else
  {
- cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, size, ir->presence());
+ cachedField_.addEncoding(ir->name(), ir->primitiveType(), value, size, ir);
  return size;
  }
 }