summaryrefslogtreecommitdiff
path: root/test/files/pos/Transactions.scala
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2008-05-20 14:25:02 +0000
committermichelou <michelou@epfl.ch>2008-05-20 14:25:02 +0000
commit3a0b0d40d7be5fb100a1b061aab54a4d4a51ae60 (patch)
treeb8bae307ad9df5c04ff7a8d68a9be755a1a6a748 /test/files/pos/Transactions.scala
parentc1f07338ed21e551446a5c98d262d738a9b7b0ce (diff)
downloadscala-3a0b0d40d7be5fb100a1b061aab54a4d4a51ae60.tar.gz
scala-3a0b0d40d7be5fb100a1b061aab54a4d4a51ae60.tar.bz2
scala-3a0b0d40d7be5fb100a1b061aab54a4d4a51ae60.zip
int -> Int, etc..
Diffstat (limited to 'test/files/pos/Transactions.scala')
-rw-r--r--test/files/pos/Transactions.scala20
1 files changed, 10 insertions, 10 deletions
diff --git a/test/files/pos/Transactions.scala b/test/files/pos/Transactions.scala
index 8fb23268dc..ed989e178e 100644
--- a/test/files/pos/Transactions.scala
+++ b/test/files/pos/Transactions.scala
@@ -1,11 +1,11 @@
-package scala.concurrent;
+package scala.concurrent
-class AbortException extends RuntimeException;
+class AbortException extends RuntimeException
object Transaction {
private var cnt = 0L
- def nextId: long = synchronized {
- cnt = cnt + 1; cnt
+ def nextId: Long = synchronized {
+ cnt += 1; cnt
}
// Transaction status constants
@@ -20,9 +20,9 @@ object Transaction {
}
class Transaction {
- var status: int = _
+ var status: Int = _
- var id: long = _ // only for real transactions
+ var id: Long = _ // only for real transactions
var head: Transaction = this
var next: Transaction = null
@@ -54,10 +54,10 @@ class Transaction {
trait Transactional {
/** create a new snapshot */
- def checkPoint(): unit
+ def checkPoint(): Unit
/** copy back snapshot */
- def rollBack(): unit
+ def rollBack(): Unit
var readers: Transaction
var writer: Transaction
@@ -71,7 +71,7 @@ trait Transactional {
null
}
- def getter(thisTrans: Transaction): unit = {
+ def getter(thisTrans: Transaction) {
if (writer == thisTrans) return
var r = readers
while (r != null && r.head.status != Transaction.Running) { r = r.next; readers = r }
@@ -91,7 +91,7 @@ trait Transactional {
}
}
- def setter(thisTrans: Transaction): unit = {
+ def setter(thisTrans: Transaction) {
if (writer == thisTrans) return
synchronized {
val w = currentWriter()