From 1b68030eacfbea18dd3365ecb3284b9e90db59de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ali=20Sinan=20K=C3=B6ksal?= <alisinan@gmail.com>
Date: Thu, 24 Mar 2011 14:31:26 +0000
Subject: [PATCH] Some renaming.
---
src/funcheck/CallTransformation.scala | 8 ++++----
src/funcheck/CodeGeneration.scala | 12 ++++++------
src/funcheck/Serialization.scala | 4 +---
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/funcheck/CallTransformation.scala b/src/funcheck/CallTransformation.scala
index 42913bce2..160120d72 100644
--- a/src/funcheck/CallTransformation.scala
+++ b/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) {
diff --git a/src/funcheck/CodeGeneration.scala b/src/funcheck/CodeGeneration.scala
index e2052a5e3..addd2cefe 100644
--- a/src/funcheck/CodeGeneration.scala
+++ b/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))
+ )
}
}
}
diff --git a/src/funcheck/Serialization.scala b/src/funcheck/Serialization.scala
index addb7e24c..e10581c00 100644
--- a/src/funcheck/Serialization.scala
+++ b/src/funcheck/Serialization.scala
@@ -72,6 +72,4 @@ trait Serialization {
}
}
-object Serialization extends Serialization {
-
-}
+object Serialization extends Serialization
--
GitLab