summaryrefslogtreecommitdiff
path: root/Chalice/src/main/scala/Ast.scala
diff options
context:
space:
mode:
authorGravatar Kuat Yessenov <kuat@csail.mit.edu>2011-12-23 01:15:27 -0500
committerGravatar Kuat Yessenov <kuat@csail.mit.edu>2011-12-23 01:15:27 -0500
commitb07a60593b867c2b06c6044bea49380199a9eac9 (patch)
treedf5a02333799f2736b4a0169d5a9c12c77ebaccd /Chalice/src/main/scala/Ast.scala
parenta587a83b6e78bcfe2f74173f0d9a4d3aeb54c6e3 (diff)
Chalice: fix all refinement regression tests
Diffstat (limited to 'Chalice/src/main/scala/Ast.scala')
-rw-r--r--Chalice/src/main/scala/Ast.scala9
1 files changed, 6 insertions, 3 deletions
diff --git a/Chalice/src/main/scala/Ast.scala b/Chalice/src/main/scala/Ast.scala
index ffb109d5..cd4a6cd8 100644
--- a/Chalice/src/main/scala/Ast.scala
+++ b/Chalice/src/main/scala/Ast.scala
@@ -223,13 +223,16 @@ case class LockChange(ee: List[Expression]) extends Specification
case class CouplingInvariant(ids: List[String], e: Expression) extends Member {
assert(ids.size > 0)
- var fields = Nil:List[Field]
+ var fields: List[Field] = Nil
/* Distribute 100 between fields */
- def fraction(field: Field) = {
+ def fraction(field: Field): Permission = {
val k = fields.indexOf(field)
assert (0 <= k && k < fields.size)
val part: Int = 100 / fields.size
- if (k == fields.size - 1) IntLiteral(100 - part * k) else IntLiteral(part)
+ if (k == fields.size - 1)
+ Frac(IntLiteral(100 - part * k))
+ else
+ Frac(IntLiteral(part) )
}
}
case class MethodTransform(id: String, ins: List[Variable], outs: List[Variable], spec: List[Specification], trans: Transform) extends Callable(id) {