1 files changed, 12 insertions, 11 deletions

diff --git a/common/rulecheck.cc b/common/rulecheck.cc
index 2f70498f..9b1ee7fe 100644
--- a/common/rulecheck.cc
+++ b/common/rulecheck.cc
@@ -16,27 +16,27 @@ bool check_all_nets_driven(Context *ctx)
 
         if (debug)
             log_info("  Examining cell \'%s\', of type \'%s\'\n",
-                     cell->name.c_str(), cell->type.c_str());
+                     cell->name.c_str(ctx), cell->type.c_str(ctx));
         for (auto port_entry : cell->ports) {
             PortInfo &port = port_entry.second;
 
             if (debug)
                 log_info("    Checking name of port \'%s\' "
                          "against \'%s\'\n",
-                         port_entry.first.c_str(), port.name.c_str());
+                         port_entry.first.c_str(ctx), port.name.c_str(ctx));
             assert(port.name == port_entry.first);
-            assert(port.name.size() > 0);
+            assert(!port.name.empty());
 
             if (port.net == NULL) {
                 if (debug)
                     log_warning(
                             "    Port \'%s\' in cell \'%s\' is unconnected\n",
-                            port.name.c_str(), cell->name.c_str());
+                            port.name.c_str(ctx), cell->name.c_str(ctx));
             } else {
                 assert(port.net);
                 if (debug)
                     log_info("    Checking for a net named \'%s\'\n",
-                             port.net->name.c_str());
+                             port.net->name.c_str(ctx));
                 assert(ctx->nets.count(port.net->name) > 0);
             }
         }
@@ -46,22 +46,23 @@ bool check_all_nets_driven(Context *ctx)
         NetInfo *net = net_entry.second;
 
         assert(net->name == net_entry.first);
-        if ((net->driver.cell != NULL) && (net->driver.cell->type != "GND") &&
-            (net->driver.cell->type != "VCC")) {
+        if ((net->driver.cell != NULL) &&
+            (net->driver.cell->type != ctx->id("GND")) &&
+            (net->driver.cell->type != ctx->id("VCC"))) {
 
             if (debug)
                 log_info("    Checking for a driver cell named \'%s\'\n",
-                         net->driver.cell->name.c_str());
+                         net->driver.cell->name.c_str(ctx));
             assert(ctx->cells.count(net->driver.cell->name) > 0);
         }
 
         for (auto user : net->users) {
-            if ((user.cell != NULL) && (user.cell->type != "GND") &&
-                (user.cell->type != "VCC")) {
+            if ((user.cell != NULL) && (user.cell->type != ctx->id("GND")) &&
+                (user.cell->type != ctx->id("VCC"))) {
 
                 if (debug)
                     log_info("    Checking for a user   cell named \'%s\'\n",
-                             user.cell->name.c_str());
+                             user.cell->name.c_str(ctx));
                 assert(ctx->cells.count(user.cell->name) > 0);
             }
         }