summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBurak Emir <emir@epfl.ch>2006-04-25 15:16:33 +0000
committerBurak Emir <emir@epfl.ch>2006-04-25 15:16:33 +0000
commit2313191913d6d0af36eb397c8882ff3953fa9f94 (patch)
tree04c03a76c110e0b1b4abbe92c5e989166d03dabc /src
parent84d3c4385eba7afecdb89a52d4162adc09d9c4e3 (diff)
downloadscala-2313191913d6d0af36eb397c8882ff3953fa9f94.tar.gz
scala-2313191913d6d0af36eb397c8882ff3953fa9f94.tar.bz2
scala-2313191913d6d0af36eb397c8882ff3953fa9f94.zip
uncommented override var
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala4
-rw-r--r--src/library/scala/xml/parsing/ExternalSources.scala2
-rw-r--r--src/library/scala/xml/parsing/MarkupParser.scala4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala b/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala
index 0e39031a9e..f74d010563 100644
--- a/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala
+++ b/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala
@@ -20,8 +20,8 @@ trait AlgebraicMatchers requires TransMatcher {
var _m: PartialMatcher = _;
- override protected var delegateSequenceMatching = true;
- override protected var optimize = false;
+ /*override protected var*/ delegateSequenceMatching = true;
+ /*override protected var*/ optimize = false;
/** constructs an algebraic pattern matcher from cases */
def construct(m: PartialMatcher, cases: List[CaseDef]): Unit =
diff --git a/src/library/scala/xml/parsing/ExternalSources.scala b/src/library/scala/xml/parsing/ExternalSources.scala
index 7282fef3fc..742b7d43ad 100644
--- a/src/library/scala/xml/parsing/ExternalSources.scala
+++ b/src/library/scala/xml/parsing/ExternalSources.scala
@@ -53,7 +53,7 @@ trait ExternalSources requires (ExternalSources with MarkupParser with MarkupHan
def reset: Source = new MyClass;
- override var descr = url.toExternalForm();
+ /*override var*/ descr = url.toExternalForm();
}
return new MyClass;
diff --git a/src/library/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala
index 688740315b..7206bcc475 100644
--- a/src/library/scala/xml/parsing/MarkupParser.scala
+++ b/src/library/scala/xml/parsing/MarkupParser.scala
@@ -647,8 +647,8 @@ trait MarkupParser requires (MarkupParser with MarkupHandler) extends AnyRef wit
}
xToken('>');
this.dtd = new DTD {
- override var externalID = extID;
- override val decls = handle.decls.reverse;
+ /*override var*/ externalID = extID;
+ /*override val */decls = handle.decls.reverse;
}
//this.dtd.initializeEntities();
handle.endDTD(n);