From fb8922192d071a65f9cb5b1ba6b29f6b69e1e25e Mon Sep 17 00:00:00 2001 From: phaller Date: Mon, 26 Oct 2009 21:07:22 +0000 Subject: [PATCH] Reverting unwanted parts of last commit. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19295 5e8d7ff9-d8ef-0310-90f0-a4852d11357a --- docs/examples/actors/fringe.scala | 9 --------- docs/examples/actors/message.scala | 12 ++---------- .../neg/plugin-after-terminal/lib/plugins.jar | Bin 4139 -> 4128 bytes .../neg/plugin-before-parser/lib/plugins.jar | Bin 4222 -> 4211 bytes .../plugin-cyclic-dependency/lib/plugins.jar | Bin 5574 -> 5563 bytes .../plugin-multiple-rafter/lib/plugins.jar | Bin 4137 -> 4170 bytes .../plugin-rafter-before-1/lib/plugins.jar | Bin 4181 -> 4170 bytes .../lib/plugins.jar | Bin 4179 -> 4168 bytes 8 files changed, 2 insertions(+), 19 deletions(-) diff --git a/docs/examples/actors/fringe.scala b/docs/examples/actors/fringe.scala index 2afdc41b4..2026628cb 100644 --- a/docs/examples/actors/fringe.scala +++ b/docs/examples/actors/fringe.scala @@ -2,8 +2,6 @@ package examples.actors import scala.actors.Actor._ import scala.actors.{Channel, OutputChannel} -import scala.actors.{Debug, Scheduler} -import scala.actors.scheduler.ResizableThreadPoolScheduler /** @author Philipp Haller @@ -20,13 +18,6 @@ object fringe extends Application { case class Equal(atom1: Option[Leaf], atom2: Option[Leaf]) case class Extract(tree: Tree) - Debug.level = 3 - Scheduler.impl = { - val s = new ResizableThreadPoolScheduler(false) - s.start() - s - } - val comparator = actor { val extractor1 = actor(extractorBehavior()) val extractor2 = actor(extractorBehavior()) diff --git a/docs/examples/actors/message.scala b/docs/examples/actors/message.scala index eb2946816..d38554347 100644 --- a/docs/examples/actors/message.scala +++ b/docs/examples/actors/message.scala @@ -3,8 +3,6 @@ package examples.actors import scala.actors.{Actor, Scheduler} import scala.actors.Actor._ import scala.actors.scheduler.SingleThreadedScheduler -import scala.actors.{Debug, Scheduler} -import scala.actors.scheduler.ResizableThreadPoolScheduler object message { def main(args: Array[String]) { @@ -16,13 +14,7 @@ object message { } val nActors = 500 val finalSum = n * nActors - //Scheduler.impl = new SingleThreadedScheduler - Debug.level = 3 - Scheduler.impl = { - val s = new ResizableThreadPoolScheduler(false) - s.start() - s - } + Scheduler.impl = new SingleThreadedScheduler def beh(next: Actor, sum: Int) { react { @@ -43,6 +35,6 @@ object message { val firstActor = actorChain(nActors, null) var i = n; while (i > 0) { firstActor ! 0; i -= 1 } - //Scheduler.shutdown() + Scheduler.shutdown() } } diff --git a/test/files/neg/plugin-after-terminal/lib/plugins.jar b/test/files/neg/plugin-after-terminal/lib/plugins.jar index 981609f70e21bae33e030dfa4abcb2d84fdbedaa..e4665c52be302b9670c9ef372b6e6e437e6a8835 100644 GIT binary patch delta 399 zcmZ3jut0$~z?+#xgn(&2C@){bSy~wuVj@qLXjME@eVzHK=wlHhLx49s zhshbXUK<7m1`tN*-4f$C@p2nT@8lRpMKImKs0OB2GU|co&9@luFoPLs+%8PqNS1Ei z$-0P@mytGP$2m)COG*H;S4JMh1rB_#>r}?Fs7P3yZ&O++=>3NKLAbRt8 z#yiYl#$WbDtlTjBK{D%DU6^@Q9RPKI1228I>9Agcg0@oI|z diff --git a/test/files/neg/plugin-before-parser/lib/plugins.jar b/test/files/neg/plugin-before-parser/lib/plugins.jar index 2a9459ed53ee2423710969d29b004725ea96a679..947a91743954746234a0739c7368e4bc9e65ba98 100644 GIT binary patch delta 467 zcmeyT@L7R3z?+#xgn(&2C@){bSy~wuVj@qLXjME@eVzHK=wlHhLx49s zhshbXUK<7m1`tN*-4f$C@p2nT@8lRpMKImKs0OB2GU|co&9@jOS-^~4+|EqgNS1E? z#=4W0mytZ9qI{EJW8Dg!QCl3HAXt^~zcVH9I0PM*Lo zrVTO@$v@Upx3z6M#LU33jDvwe2SxoMpn7X?K*mIJdt01a+H7oT7aD6muAx8 g07}Zq=q2YQ78eJ2vx5D@$-v2w%f!I𝔣f061b^EC2ui delta 407 zcmeyY@K1p^z?+#xgnw#hDhrp!QFCfD#uGaj2fgHHi$ z_-;OFNq6A1}>n>7(gDI{2r*bcrrJ?lmf^surQPmM&>ZgVVwMc zUvzR5KM&Z@Onzymvmhb)$$uI7`9Y>4yG=$wn(^i2`~31oddWG7#l>jy)_Lz2pZp4R h(?Mni25l63)^Y<4)fZu91Br41VJ;H`!*5;?4*>2pXQ2Q9 diff --git a/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar b/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar index 43a043ac042e612ca0a98c2e1133b29322a49906..93324ccabcaaea3c06900cb28017be11dacfad56 100644 GIT binary patch delta 520 zcmX@6y<3|%z?+#xgn(&2C@){bSy~wuVj@qLXjME@eVzHK=wlHhLx49s zhshbXUK<7m1`tN*-4f$C@p2n;M^eP(7)C`f-N2{@rdKlRf#}V#JU&cd#u`3b7H*iO zARTM?%r*-!@vwkp<=Kqcco~^Q7~qbY{7uM$7w9T$xYd)bg-zvwR$AvVzcBCuIwTE< z1%Vg=c29gLQXk;W$i&6K1r`NbWQ~w!U|>V$Ft{)>Fcc>z<|OLl)5DFTCj+jhB(=B% zi^j=HA`(m!87DW2it>Yuh4~5OXKqnxrb8ep`N`cpd^%{-){kl)9(c>lz;J+rfk79= zRzVh^CPSnU0-2T|BFz-Z0hCamEWpGud5s7UIOul+h3D}Ah2>=Ql5-M^ivzq_!TtsX N%1I^$hC4zavjOWJXjuRN delta 514 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 delta 3251 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 B&uIVv diff --git a/test/files/neg/plugin-rafter-before-1/lib/plugins.jar b/test/files/neg/plugin-rafter-before-1/lib/plugins.jar index ca8d871366e3063e430abb9c6d9661f6fe57d456..622c1ddb50eda00affd43b4dec51afa72596bb21 100644 GIT binary patch delta 366 zcmcbra7uwUz?+#xgn@hJ z{N!u=QVJkT<^CSKzlWKDp^AfnK^JTij1Xi2Dl|lMs~6A&4Gy4$oQz&_PGWI!fHx}} QNCzhn<}ooa9ODJ?0Dli#kpKVy delta 430 zcmX@5a8-dfz?+#xgnw#ia_rt&~rtn-*(7=lk@l#z*bJ=lQ#8dWMC*xPRvQv5AbGW;$q+eD+HN|(80jKjm%*vp8Swc3T(nZ zK53>ojFSZfL?;{Y^C*C{iH2^TB7js zP@J5Ylc*oy&B(;Xzy)+11IR;@&jXcbOn%KLr2sMxEDR-tkvR+#87CiP6`gFw4>8n} zUz+I%wh#=(i0HWLe&!993bDz%D}+P g&A_09qU8lUP>YIKfHx}}NSqT0bD0_DihXNcL}D&g#s>%g7|c0C&>lE4&uGKuy+g+a^o$nKA=ynH1B2R