Merge pull request #1 from mgudemann/enhancement/rename/cbmcName_to_j…

…bmcName Rename `cbmcName` to `jbmcName`
diffblue · Oct 1, 2021 · dbeb40f · dbeb40f
2 parents 6de9428 + 20bb470
commit dbeb40f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/org/cprover/coverage/CoverageInstrument.java b/src/main/java/org/cprover/coverage/CoverageInstrument.java
@@ -143,7 +143,7 @@ public void instrumentClassFile(
 
     for (int i = 0; i < properties.size(); i++) {
       JsonObject entry = properties.getJsonObject(i);
-      String cbmcName = entry.getString("name");
+      String jbmcName = entry.getString("name");
 
       if (entry.containsKey(SOURCE_LOCATION)) {
         JsonObject jSourceLoc = entry.getJsonObject(SOURCE_LOCATION);
@@ -196,13 +196,13 @@ public void instrumentClassFile(
             offsetIdMap.put(hashCode, uid);
             int[] lineNums = new int[lineNumbers.size()];
             if (lineNumbers.size() == 0) {
-              System.out.println("ERROR: no line numbers for " + cbmcName);
+              System.out.println("ERROR: no line numbers for " + jbmcName);
             }
             for (int k = 0; k < lineNums.length; k++) {
               lineNums[k] = (Integer) lineNumbers.get(k);
             }
             logger
-                .register(uid, cbmcName, className, method, bcLine, lineNums);
+                .register(uid, jbmcName, className, method, bcLine, lineNums);
             System.out
                 .println("register ID " + uid + " "
                     + logger.getBasicBlockID(className, method, bcLine));

diff --git a/src/main/java/org/cprover/coverage/CoverageLog.java b/src/main/java/org/cprover/coverage/CoverageLog.java
@@ -60,9 +60,9 @@ public final class CoverageLog extends Thread {
    */
   private String descriptionMap = "descriptionMap";
   /**
-   * <code>cbmcNameMap</code> maps UID to JBMC internal name.
+   * <code>jbmcNameMap</code> maps UID to JBMC internal name.
    */
-  private String cbmcNameMap = "nameMap";
+  private String jbmcNameMap = "nameMap";
   /**
    * Indicates that all {@link DB} objects should use {@link DBMaker.Maker#cleanerHackEnable()}.
    */
@@ -138,7 +138,7 @@ private CoverageLog() {
         .keySerializer(Serializer.STRING)
         .valueSerializer(Serializer.INTEGER)
         .createOrOpen();
-    nameMap = db.hashMap(cbmcNameMap)
+    nameMap = db.hashMap(jbmcNameMap)
         .keySerializer(Serializer.INTEGER)
         .valueSerializer(Serializer.STRING)
         .createOrOpen();
@@ -233,15 +233,15 @@ public void record(final int key) {
    * <code>register</code> basic block in database.
    *
    * @param key         UID <code>int</code> value
-   * @param cbmcName    name of property used by JBMC <code>String</code>
+   * @param jbmcName    name of property used by JBMC <code>String</code>
    * @param className   name of class as <code>String</code>
    * @param methodName  name of method + signature as <code>String</code>
    * @param bcLoc       bytecode offset of basic block as <code>int</code>
    * @param lineNumbers lines covered by this property as <code>int[]</code>
    */
   public void register(
       final int key,
-      final String cbmcName,
+      final String jbmcName,
       final String className,
       final String methodName,
       final int bcLoc,
@@ -250,7 +250,7 @@ public void register(
     if (!locMap.containsKey(key)) {
       locMap.put(key, desc);
       descMap.put(desc, key);
-      nameMap.put(key, cbmcName);
+      nameMap.put(key, jbmcName);
       lineMap.put(key, lineNumbers);
       id++;
     }