odb: fix member naming in dbBox

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

src/odb/src/db/dbBPin.cpp

@@ -251,9 +251,9 @@ void dbBPin::destroy(dbBPin* bpin_)
   dbId<_dbBox> nextBox = bpin->_boxes;
   while (nextBox) {
     _dbBox* b = block->_box_tbl->getPtr(nextBox);
-    nextBox = b->_next_box;
+    nextBox = b->next_box_;
     dbProperty::destroyProperties(b);
-    block->remove_rect(b->_shape._rect);
+    block->remove_rect(b->shape_.rect);
     block->_box_tbl->destroy(b);
   }
 
@@ -294,7 +294,7 @@ void _dbBPin::removeBox(_dbBox* box)
   dbId<_dbBox> boxid = box->getOID();
   if (boxid == _boxes) {
     // at head of list, need to move head
-    _boxes = box->_next_box;
+    _boxes = box->next_box_;
   } else {
     // in the middle of the list, need to iterate and relink
     dbId<_dbBox> id = _boxes;
@@ -303,10 +303,10 @@ void _dbBPin::removeBox(_dbBox* box)
     }
     while (id != 0) {
       _dbBox* nbox = block->_box_tbl->getPtr(id);
-      dbId<_dbBox> nid = nbox->_next_box;
+      dbId<_dbBox> nid = nbox->next_box_;
 
       if (nid == boxid) {
-        nbox->_next_box = box->_next_box;
+        nbox->next_box_ = box->next_box_;
         break;
       }
 

src/odb/src/db/dbBlock.cpp

@@ -564,9 +564,9 @@ void _dbBlock::initialize(_dbChip* chip,
   _name = safe_strdup(name);
 
   _dbBox* box = _box_tbl->create();
-  box->_flags._owner_type = dbBoxOwner::BLOCK;
-  box->_owner = getOID();
-  box->_shape._rect.reset(INT_MAX, INT_MAX, INT_MIN, INT_MIN);
+  box->flags_.owner_type = dbBoxOwner::BLOCK;
+  box->owner_ = getOID();
+  box->shape_.rect.reset(INT_MAX, INT_MAX, INT_MIN, INT_MIN);
   _bbox = box->getOID();
   _chip = chip->getOID();
   _hier_delimiter = delimiter;
@@ -1108,15 +1108,15 @@ void _dbBlock::add_rect(const Rect& rect)
   _dbBox* box = _box_tbl->getPtr(_bbox);
 
   if (_flags._valid_bbox) {
-    box->_shape._rect.merge(rect);
+    box->shape_.rect.merge(rect);
   }
 }
 void _dbBlock::add_oct(const Oct& oct)
 {
   _dbBox* box = _box_tbl->getPtr(_bbox);
 
   if (_flags._valid_bbox) {
-    box->_shape._rect.merge(oct);
+    box->shape_.rect.merge(oct);
   }
 }
 
@@ -1125,7 +1125,7 @@ void _dbBlock::remove_rect(const Rect& rect)
   _dbBox* box = _box_tbl->getPtr(_bbox);
 
   if (_flags._valid_bbox) {
-    _flags._valid_bbox = box->_shape._rect.inside(rect);
+    _flags._valid_bbox = box->shape_.rect.inside(rect);
   }
 }
 
@@ -1496,12 +1496,12 @@ dbBox* dbBlock::getBBox()
 void _dbBlock::ComputeBBox()
 {
   _dbBox* bbox = _box_tbl->getPtr(_bbox);
-  bbox->_shape._rect.reset(INT_MAX, INT_MAX, INT_MIN, INT_MIN);
+  bbox->shape_.rect.reset(INT_MAX, INT_MAX, INT_MIN, INT_MIN);
 
   for (dbInst* inst : dbSet<dbInst>(this, _inst_tbl)) {
     if (inst->isPlaced()) {
       _dbBox* box = (_dbBox*) inst->getBBox();
-      bbox->_shape._rect.merge(box->_shape._rect);
+      bbox->shape_.rect.merge(box->shape_.rect);
     }
   }
 
@@ -1510,31 +1510,31 @@ void _dbBlock::ComputeBBox()
       if (bp->getPlacementStatus().isPlaced()) {
         for (dbBox* box : bp->getBoxes()) {
           Rect r = box->getBox();
-          bbox->_shape._rect.merge(r);
+          bbox->shape_.rect.merge(r);
         }
       }
     }
   }
 
   for (dbObstruction* obs : dbSet<dbObstruction>(this, _obstruction_tbl)) {
     _dbBox* box = (_dbBox*) obs->getBBox();
-    bbox->_shape._rect.merge(box->_shape._rect);
+    bbox->shape_.rect.merge(box->shape_.rect);
   }
 
   for (dbSBox* box : dbSet<dbSBox>(this, _sbox_tbl)) {
     Rect rect = box->getBox();
-    bbox->_shape._rect.merge(rect);
+    bbox->shape_.rect.merge(rect);
   }
 
   for (dbWire* wire : dbSet<dbWire>(this, _wire_tbl)) {
     const auto opt_bbox = wire->getBBox();
     if (opt_bbox) {
-      bbox->_shape._rect.merge(opt_bbox.value());
+      bbox->shape_.rect.merge(opt_bbox.value());
     }
   }
 
-  if (bbox->_shape._rect.xMin() == INT_MAX) {  // empty block
-    bbox->_shape._rect.reset(0, 0, 0, 0);
+  if (bbox->shape_.rect.xMin() == INT_MAX) {  // empty block
+    bbox->shape_.rect.reset(0, 0, 0, 0);
   }
 
   _flags._valid_bbox = 1;

src/odb/src/db/dbBlockage.cpp

@@ -209,14 +209,14 @@ dbBlockage* dbBlockage::create(dbBlock* block_,
   }
 
   _dbBox* box = block->_box_tbl->create();
-  box->_shape._rect.init(x1, y1, x2, y2);
-  box->_flags._owner_type = dbBoxOwner::BLOCKAGE;
-  box->_owner = bkg->getOID();
+  box->shape_.rect.init(x1, y1, x2, y2);
+  box->flags_.owner_type = dbBoxOwner::BLOCKAGE;
+  box->owner_ = bkg->getOID();
   bkg->_bbox = box->getOID();
 
   // Update bounding box of block
   _dbBox* bbox = (_dbBox*) block->_box_tbl->getPtr(block->_bbox);
-  bbox->_shape._rect.merge(box->_shape._rect);
+  bbox->shape_.rect.merge(box->shape_.rect);
   for (auto callback : block->_callbacks) {
     callback->inDbBlockageCreate((dbBlockage*) bkg);
   }