From 9f530f5357b0600a9dfe86d83b84a8c57b1a0a14 Mon Sep 17 00:00:00 2001
From: Etienne Kneuss <ekneuss@gmail.com>
Date: Mon, 10 Dec 2012 18:18:54 +0100
Subject: [PATCH] Renamings
---
src/main/scala/leon/codegen/CompilationUnit.scala | 10 +++++-----
src/main/scala/leon/codegen/CompiledExpression.scala | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/scala/leon/codegen/CompilationUnit.scala b/src/main/scala/leon/codegen/CompilationUnit.scala
index 35b3a59ee..1cba64477 100644
--- a/src/main/scala/leon/codegen/CompilationUnit.scala
+++ b/src/main/scala/leon/codegen/CompilationUnit.scala
@@ -33,11 +33,11 @@ class CompilationUnit(val program: Program, val classes: Map[Definition, ClassFi
_nextExprId
}
- private[codegen] def groundExprToJava(e: Expr): Any = {
- compileExpression(e, Seq()).evalToJava(Seq())
+ private[codegen] def valueToJVM(e: Expr): Any = {
+ compileExpression(e, Seq()).evalToJVM(Seq())
}
- private[codegen] def javaToGroundExpr(e: AnyRef): Expr = e match {
+ private[codegen] def jvmToValue(e: AnyRef): Expr = e match {
case i: Integer =>
IntLiteral(i.toInt)
@@ -49,14 +49,14 @@ class CompilationUnit(val program: Program, val classes: Map[Definition, ClassFi
jvmClassToDef.get(e.getClass.getName) match {
case Some(cc: CaseClassDef) =>
- CaseClass(cc, fields.map(javaToGroundExpr))
+ CaseClass(cc, fields.map(jvmToValue))
case _ =>
throw CompilationException("Unsupported return value : " + e)
}
case tpl: runtime.Tuple =>
val elems = for (i <- 0 until tpl.getArity) yield {
- javaToGroundExpr(tpl.get(i))
+ jvmToValue(tpl.get(i))
}
Tuple(elems)
diff --git a/src/main/scala/leon/codegen/CompiledExpression.scala b/src/main/scala/leon/codegen/CompiledExpression.scala
index dda70f9f7..0c10fe02a 100644
--- a/src/main/scala/leon/codegen/CompiledExpression.scala
+++ b/src/main/scala/leon/codegen/CompiledExpression.scala
@@ -14,7 +14,7 @@ import cafebabe.Flags._
class CompiledExpression(unit: CompilationUnit, cf: ClassFile, argsDecl: Seq[Identifier]) {
- def evalToJava(args: Seq[Expr]): AnyRef = {
+ def evalToJVM(args: Seq[Expr]): AnyRef = {
val cl = unit.loader.loadClass(cf.className)
val meth = cl.getMethods()(0)
@@ -23,12 +23,12 @@ class CompiledExpression(unit: CompilationUnit, cf: ClassFile, argsDecl: Seq[Ide
if (args.isEmpty) {
meth.invoke(null)
} else {
- meth.invoke(null, args.map(unit.groundExprToJava).toArray)
+ meth.invoke(null, args.map(unit.valueToJVM).toArray)
}
}
def eval(args: Seq[Expr]): Expr = {
- unit.javaToGroundExpr(evalToJava(args))
+ unit.jvmToValue(evalToJVM(args))
}
}
--
GitLab