Some renaming.

src/funcheck/CallTransformation.scala

@@ -32,16 +32,16 @@ trait CallTransformation
 
           println("Here is the extracted FunDef:") 
           println(fd)
-          
+
           val codeGen = new CodeGenerator(unit, currentOwner)
 
           fd.body match {
             case None => println("Could not extract choose predicate: " + funBody); super.transform(tree)
             case Some(b) =>
               val exprFilename = writeExpr(b)
-              val (programGet, progSym) = codeGen.generateProgramGet(programFilename)
-              val (exprGet, exprSym) = codeGen.generateExprGet(exprFilename)
-              val solverInvocation = codeGen.generateSolverInvocation(b, progSym, exprSym)
+              val (programGet, progSym) = codeGen.getProgram(programFilename)
+              val (exprGet, exprSym) = codeGen.getExpr(exprFilename)
+              val solverInvocation = codeGen.invokeSolver(b, progSym, exprSym)
               val code = Block(programGet :: exprGet :: Nil, solverInvocation)
 
               typer.typed(atOwner(currentOwner) {

src/funcheck/CodeGeneration.scala

@@ -28,7 +28,7 @@ trait CodeGeneration {
 
   class CodeGenerator(unit : CompilationUnit, owner : Symbol) {
 
-    def generateProgramGet(filename : String) : (Tree, Symbol) = {
+    def getProgram(filename : String) : (Tree, Symbol) = {
       val progSymbol = owner.newValue(NoPosition, unit.fresh.newName(NoPosition, "prog")).setInfo(programClass.tpe)
       val getStatement =
         ValDef(
@@ -47,7 +47,7 @@ trait CodeGeneration {
       (getStatement, progSymbol)
     }
 
-    def generateExprGet(filename : String) : (Tree, Symbol) = {
+    def getExpr(filename : String) : (Tree, Symbol) = {
       val exprSymbol = owner.newValue(NoPosition, unit.fresh.newName(NoPosition, "expr")).setInfo(exprClass.tpe)
       val getStatement =
         ValDef(
@@ -66,7 +66,7 @@ trait CodeGeneration {
       (getStatement, exprSymbol)
     }
 
-    def generateSolverInvocation(formula : Expr, progSymbol : Symbol, exprSymbol : Symbol) : Tree = {
+    def invokeSolver(formula : Expr, progSymbol : Symbol, exprSymbol : Symbol) : Tree = {
       val solverSymbol = owner.newValue(NoPosition, unit.fresh.newName(NoPosition, "solver")).setInfo(fairZ3SolverClass.tpe)
       val solverDeclaration = 
         ValDef(
@@ -102,9 +102,9 @@ trait CodeGeneration {
         )
 
       Block(
-            solverDeclaration :: setProgram :: invocation :: Nil,
-            Literal(Constant(0))
-          )
+        solverDeclaration :: setProgram :: invocation :: Nil,
+        Literal(Constant(0))
+      )
     }
   }
 }

src/funcheck/Serialization.scala

@@ -72,6 +72,4 @@ trait Serialization {
   }
 }
 
-object Serialization extends Serialization {
-  
-}
+object Serialization extends Serialization