digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 17:28:46 +03:00
Code Issues Projects Releases Wiki Activity

Speedy Compiler: move constants to companion object (#5639)

Browse Source 
CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
Remy 2020-04-20 22:15:44 +02:00 committed by GitHub
parent eb1afc7d77
commit ea797de16e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Compiler.scala
View File

@ -7,7 +7,6 @@ import com.daml.lf.data.Ref._
import com.daml.lf.data.{ImmArray, Ref, Time}
import com.daml.lf.language.Ast._
import com.daml.lf.language.Util._
import com.daml.lf.speedy.Compiler.{CompileError, PackageNotFound}
import com.daml.lf.speedy.SBuiltin._
import com.daml.lf.speedy.SExpr._
import com.daml.lf.speedy.SValue._
@ -30,9 +29,26 @@ object Compiler {
case class CompileError(error: String) extends RuntimeException(error, null, true, false)
case class PackageNotFound(pkgId: PackageId)
extends RuntimeException(s"Package not found $pkgId", null, true, false)
private val compileGetTime: SExpr = SEAbs(1) { SBGetTime(SEVar(1)) }
private def SBCompareNumeric(b: SBuiltin) =
SEAbs(3, SEApp(SEBuiltin(b), Array(SEVar(2), SEVar(1))))
private val SBLessNumeric = SBCompareNumeric(SBLess)
private val SBLessEqNumeric = SBCompareNumeric(SBLessEq)
private val SBGreaterNumeric = SBCompareNumeric(SBGreater)
private val SBGreaterEqNumeric = SBCompareNumeric(SBGreaterEq)
private val SBEqualNumeric = SBCompareNumeric(SBEqual)
private val SEDropSecondArgument = SEAbs(2, SEVar(2))
private val SEUpdatePureUnit = SEApp(SEDropSecondArgument, Array(SEValue.Unit))
private val appBoundHead = SEApp(SEVar(2), Array(SEVar(1)))
}
final case class Compiler(packages: PackageId PartialFunction Package) {
import Compiler._
private val logger = LoggerFactory.getLogger(this.getClass)
private abstract class VarRef { def name: Ref.Name }
@ -177,20 +193,6 @@ final case class Compiler(packages: PackageId PartialFunction Package) {
case SCPCons => 2
}
private val compileGetTime: SExpr =
SEAbs(1) { SBGetTime(SEVar(1)) }
private val SBLessNumeric =
SEAbs(3, SEApp(SEBuiltin(SBLess), Array(SEVar(2), SEVar(1))))
private val SBLessEqNumeric =
SEAbs(3, SEApp(SEBuiltin(SBLessEq), Array(SEVar(2), SEVar(1))))
private val SBGreaterNumeric =
SEAbs(3, SEApp(SEBuiltin(SBGreater), Array(SEVar(2), SEVar(1))))
private val SBGreaterEqNumeric =
SEAbs(3, SEApp(SEBuiltin(SBGreaterEq), Array(SEVar(2), SEVar(1))))
private val SBEqualNumeric =
SEAbs(3, SEApp(SEBuiltin(SBEqual), Array(SEVar(2), SEVar(1))))
private def translate(expr0: Expr): SExpr =
expr0 match {
case EVar(name) => SEVar(env.lookUpExprVar(name))
@ -696,8 +698,6 @@ final case class Compiler(packages: PackageId PartialFunction Package) {
}
}
private val SEDropSecondArgument = SEAbs(2, SEVar(2))
private def translatePure(body: Expr): SExpr =
// pure <E>
// =>
@ -1307,9 +1307,6 @@ final case class Compiler(packages: PackageId PartialFunction Package) {
compileLookupByKey(templateId, SEValue(contractKey))
}
private val SEUpdatePureUnit = translate(EUpdate(UpdatePure(TUnit, EUnit)))
private val appBoundHead = SEApp(SEVar(2), Array(SEVar(1)))
private def translateCommands(bindings: ImmArray[Command]): SExpr = {
if (bindings.isEmpty)