refactor

star-finder · Nov 10, 2017 · 13bdde3 · 13bdde3
1 parent 9497163
commit 13bdde3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 34 deletions.
diff --git a/src/jpf/starlib/jpf/testsuites/InitVarsVisitor.java b/src/jpf/starlib/jpf/testsuites/InitVarsVisitor.java
@@ -99,38 +99,4 @@ public boolean isClassVariable(Variable var) {
 		return classVars.contains(var.getName());
 	}
 
-	public String standardizeName(Variable var) {
-		String name = var.getName();
-
-		if (isInstanceVariable(var))
-			name = name.replace("this_", objName + ".");
-		else if (isClassVariable(var))
-			name = name.replace(clsName + "_", clsName + ".");
-
-		return name;
-	}
-
-	/*
-	 * Generate the declaration for this variable
-	 */
-	public String makeDeclaration(Variable var) {
-		String name = var.getName();
-
-		if (isInstanceVariable(var))
-			name = name.replace("this_", objName + ".");
-		else if (isClassVariable(var))
-			name = name.replace(clsName + "_", clsName + ".");
-		else 
-			name = var.getType() + " " + name;
-
-		return name;
-	}
-
-	public String makeDeclAndInit(Variable var, String value) {
-		return "\t\t" + makeDeclaration(var) + " = " + value + ";\n";
-	}
-
-	public String makeDeclAndInitWithConstructor(Variable var) {
-		return makeDeclAndInit(var,"new " + var.getType() + "()");
-	}
 }
diff --git a/src/jpf/starlib/jpf/testsuites/TestGenVisitor.java b/src/jpf/starlib/jpf/testsuites/TestGenVisitor.java
@@ -70,4 +70,40 @@ private void genDefaultVars() {
 			}
 		}
 	}
+
+	public String standardizeName(Variable var) {
+		String name = var.getName();
+
+		if (isInstanceVariable(var))
+			name = name.replace("this_", objName + ".");
+		else if (isClassVariable(var))
+			name = name.replace(clsName + "_", clsName + ".");
+
+		return name;
+	}
+
+	/*
+	 * Generate the declaration for this variable
+	 */
+	public String makeDeclaration(Variable var) {
+		String name = var.getName();
+
+		if (isInstanceVariable(var))
+			name = name.replace("this_", objName + ".");
+		else if (isClassVariable(var))
+			name = name.replace(clsName + "_", clsName + ".");
+		else 
+			name = var.getType() + " " + name;
+
+		return name;
+	}
+
+	public String makeDeclAndInit(Variable var, String value) {
+		return "\t\t" + makeDeclaration(var) + " = " + value + ";\n";
+	}
+
+	public String makeDeclAndInitWithConstructor(Variable var) {
+		return makeDeclAndInit(var,"new " + var.getType() + "()");
+	}
+
 }