summaryrefslogtreecommitdiff
path: root/test/pending/pos
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-09-01 09:43:36 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-09-01 09:43:36 +0000
commit58882f89e76fd1cf824dfd9c537cadf153064860 (patch)
treef61511b071df41d79413a7d2d468ccf945a35524 /test/pending/pos
parentcc57d03af8a97c4b9a6162acbc3a727384bb8a86 (diff)
downloadscala-58882f89e76fd1cf824dfd9c537cadf153064860.tar.gz
scala-58882f89e76fd1cf824dfd9c537cadf153064860.tar.bz2
scala-58882f89e76fd1cf824dfd9c537cadf153064860.zip
Undid all commits between 22566 and 22597 included
in the 2.8.x branch, restoring the status to 2.8.0 final release, in preparation for 2.8.1.
Diffstat (limited to 'test/pending/pos')
-rw-r--r--test/pending/pos/t3636.scala49
1 files changed, 0 insertions, 49 deletions
diff --git a/test/pending/pos/t3636.scala b/test/pending/pos/t3636.scala
deleted file mode 100644
index 24d18c653d..0000000000
--- a/test/pending/pos/t3636.scala
+++ /dev/null
@@ -1,49 +0,0 @@
-class CTxnLocal[ T ] {
- def set( x: T )( implicit t: Txn ) {}
- def get( implicit t: Txn ) : T = null.asInstanceOf[ T ]
- def initialValue( t: Txn ) : T = null.asInstanceOf[ T ]
-}
-
-trait Txn
-
-trait ProcTxn {
- def ccstm: Txn
-}
-
-trait TxnLocal[ @specialized T ] {
- def apply()( implicit tx: ProcTxn ) : T
- def set( v: T )( implicit tx: ProcTxn ) : Unit
- def swap( v: T )( implicit tx: ProcTxn ) : T
- def transform( f: T => T )( implicit tx: ProcTxn ) : Unit
-}
-
-object TxnLocal {
- def apply[ @specialized T ] : TxnLocal[ T ] = new Impl( new CTxnLocal[ T ])
- def apply[ @specialized T ]( initValue: => T ) : TxnLocal[ T ] = new Impl( new CTxnLocal[ T ] {
- override def initialValue( tx: Txn ): T = initValue
- })
-
- private class Impl[ T ]( c: CTxnLocal[ T ]) extends TxnLocal[ T ] {
- def apply()( implicit tx: ProcTxn ) : T = c.get( tx.ccstm )
- def set( v: T )( implicit tx: ProcTxn ) : Unit = c.set( v )( tx.ccstm )
- def swap( v: T )( implicit tx: ProcTxn ) : T = {
- // currently not implemented in CTxnLocal
- val oldV = apply
- set( v )
- oldV
- }
- def transform( f: T => T )( implicit tx: ProcTxn ) {
- set( f( apply ))
- }
- }
-}
-
-
-object Transition {
- private val currentRef = TxnLocal[ Transition ]( Instant )
- def current( implicit tx: ProcTxn ) : Transition = currentRef()
-}
-
-sealed abstract class Transition
-case object Instant extends Transition
-