Merge pull request #8583 from The-OpenROAD-Project-staging/odb-enum-name

odb: use Google-style enum naming for gds::DataType

Author: maliberty

src/odb/include/odb/gdsUtil.h

@@ -125,20 +125,18 @@ extern const char* recordNames[];
  */
 enum class DataType : uint8_t
 {
-// TODO: https://google.github.io/styleguide/cppguide.html#Enumerator_Names
-#undef NO_DATA  // avoid conflict with macro in /usr/include/netdb.h
-  NO_DATA,
-  BIT_ARRAY,
-  INT_2,
-  INT_4,
-  REAL_4,
-  REAL_8,
-  ASCII_STRING,
-  INVALID_DT
+  kNoData,
+  kBitArray,
+  kInt2,
+  kInt4,
+  kReal4,
+  kReal8,
+  kAsciiString,
+  kInvalid
 };
 
 /** dataType sizes in number of bytes */
-inline constexpr size_t dataTypeSize[(int) DataType::INVALID_DT]
+inline constexpr size_t dataTypeSize[(int) DataType::kInvalid]
     = {1, 1, 2, 4, 4, 8, 1};
 
 /**

src/odb/src/gdsin/gdsUtil.cpp

@@ -57,15 +57,15 @@ uint8_t fromRecordType(RecordType recordType)
 
 DataType toDataType(uint8_t dataType)
 {
-  if (dataType >= (uint8_t) DataType::INVALID_DT) {
+  if (dataType >= (uint8_t) DataType::kInvalid) {
     throw std::runtime_error("Corrupted GDS, Invalid data type!");
   }
   return static_cast<DataType>(dataType);
 }
 
 uint8_t fromDataType(DataType dataType)
 {
-  if (dataType >= DataType::INVALID_DT) {
+  if (dataType >= DataType::kInvalid) {
     throw std::runtime_error("Corrupted GDS, Invalid data type!");
   }
   return static_cast<uint8_t>(dataType);

src/odb/src/gdsin/gdsin.cpp

@@ -106,28 +106,28 @@ bool GDSReader::readRecord()
   }
   _r.length = recordLength;
   const int length = recordLength - 4;
-  if (dataType == DataType::INT_2) {
+  if (dataType == DataType::kInt2) {
     _r.data16.clear();
     for (int i = 0; i < length; i += 2) {
       _r.data16.push_back(readInt16());
     }
-  } else if (dataType == DataType::INT_4) {
+  } else if (dataType == DataType::kInt4) {
     _r.data32.clear();
     for (int i = 0; i < length; i += 4) {
       _r.data32.push_back(readInt32());
     }
-  } else if (dataType == DataType::REAL_8) {
+  } else if (dataType == DataType::kReal8) {
     _r.data64.clear();
     for (int i = 0; i < length; i += 8) {
       _r.data64.push_back(readReal8());
     }
-  } else if (dataType == DataType::ASCII_STRING
-             || dataType == DataType::BIT_ARRAY) {
+  } else if (dataType == DataType::kAsciiString
+             || dataType == DataType::kBitArray) {
     _r.data8.clear();
     for (int i = 0; i < length; i++) {
       _r.data8.push_back(readInt8());
     }
-    if (dataType == DataType::ASCII_STRING && !_r.data8.empty()
+    if (dataType == DataType::kAsciiString && !_r.data8.empty()
         && _r.data8.back() == 0) {
       _r.data8.pop_back();  // Discard null terminator
     }