From 26d42fd7d80e8213f15e254041e052eb9c15a91d Mon Sep 17 00:00:00 2001 From: extempore Date: Sat, 13 Jun 2009 14:56:58 +0000 Subject: [PATCH] Fixed some deprecation warnings. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@18028 5e8d7ff9-d8ef-0310-90f0-a4852d11357a --- docs/examples/monads/callccInterpreter.scala | 4 ++-- docs/examples/monads/directInterpreter.scala | 4 ++-- docs/examples/monads/errorInterpreter.scala | 4 ++-- docs/examples/monads/simpleInterpreter.scala | 4 ++-- docs/examples/monads/stateInterpreter.scala | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/examples/monads/callccInterpreter.scala b/docs/examples/monads/callccInterpreter.scala index 781535f87..5b556bd8f 100644 --- a/docs/examples/monads/callccInterpreter.scala +++ b/docs/examples/monads/callccInterpreter.scala @@ -21,7 +21,7 @@ object callccInterpreter { trait Term; case class Var(x: Name) extends Term; - case class Con(n: int) extends Term; + case class Con(n: Int) extends Term; case class Add(l: Term, r: Term) extends Term; case class Lam(x: Name, body: Term) extends Term; case class App(fun: Term, arg: Term) extends Term; @@ -31,7 +31,7 @@ object callccInterpreter { case object Wrong extends Value { override def toString() = "wrong" } - case class Num(n: int) extends Value { + case class Num(n: Int) extends Value { override def toString() = n.toString(); } case class Fun(f: Value => M[Value]) extends Value { diff --git a/docs/examples/monads/directInterpreter.scala b/docs/examples/monads/directInterpreter.scala index 224b19bcd..06fffba8e 100644 --- a/docs/examples/monads/directInterpreter.scala +++ b/docs/examples/monads/directInterpreter.scala @@ -4,14 +4,14 @@ object directInterpreter { trait Term; case class Var(x: Name) extends Term; - case class Con(n: int) extends Term; + case class Con(n: Int) extends Term; case class Add(l: Term, r: Term) extends Term; case class Lam(x: Name, body: Term) extends Term; case class App(fun: Term, arg: Term) extends Term; trait Value; case object Wrong extends Value; - case class Num(n: int) extends Value; + case class Num(n: Int) extends Value; case class Fun(f: Value => Value)extends Value; def showval(v: Value): String = v match { diff --git a/docs/examples/monads/errorInterpreter.scala b/docs/examples/monads/errorInterpreter.scala index 536b7a152..d3cc45627 100644 --- a/docs/examples/monads/errorInterpreter.scala +++ b/docs/examples/monads/errorInterpreter.scala @@ -25,7 +25,7 @@ object errorInterpreter { trait Term case class Var(x: Name) extends Term - case class Con(n: int) extends Term + case class Con(n: Int) extends Term case class Add(l: Term, r: Term) extends Term case class Lam(x: Name, body: Term) extends Term case class App(fun: Term, arg: Term) extends Term @@ -34,7 +34,7 @@ object errorInterpreter { case object Wrong extends Value { override def toString() = "wrong" } - case class Num(n: int) extends Value { + case class Num(n: Int) extends Value { override def toString() = n.toString() } case class Fun(f: Value => M[Value]) extends Value { diff --git a/docs/examples/monads/simpleInterpreter.scala b/docs/examples/monads/simpleInterpreter.scala index b168b25de..cde3a92db 100644 --- a/docs/examples/monads/simpleInterpreter.scala +++ b/docs/examples/monads/simpleInterpreter.scala @@ -14,7 +14,7 @@ object simpleInterpreter { trait Term; case class Var(x: Name) extends Term; - case class Con(n: int) extends Term; + case class Con(n: Int) extends Term; case class Add(l: Term, r: Term) extends Term; case class Lam(x: Name, body: Term) extends Term; case class App(fun: Term, arg: Term) extends Term; @@ -23,7 +23,7 @@ object simpleInterpreter { case object Wrong extends Value { override def toString() = "wrong" } - case class Num(n: int) extends Value { + case class Num(n: Int) extends Value { override def toString() = n.toString(); } case class Fun(f: Value => M[Value]) extends Value { diff --git a/docs/examples/monads/stateInterpreter.scala b/docs/examples/monads/stateInterpreter.scala index ace37b9a0..97f3335da 100644 --- a/docs/examples/monads/stateInterpreter.scala +++ b/docs/examples/monads/stateInterpreter.scala @@ -2,7 +2,7 @@ package examples.monads; object stateInterpreter { - type State = int; + type State = Int; val tickS = new M(s => Pair((), s + 1)); @@ -25,7 +25,7 @@ object stateInterpreter { trait Term; case class Var(x: Name) extends Term; - case class Con(n: int) extends Term; + case class Con(n: Int) extends Term; case class Add(l: Term, r: Term) extends Term; case class Lam(x: Name, body: Term) extends Term; case class App(fun: Term, arg: Term) extends Term; @@ -34,7 +34,7 @@ object stateInterpreter { case object Wrong extends Value { override def toString() = "wrong" } - case class Num(n: int) extends Value { + case class Num(n: Int) extends Value { override def toString() = n.toString(); } case class Fun(f: Value => M[Value]) extends Value {