Skip to content

Commit e9decad

Browse files
Burak Emiradriaanm
Burak Emir
authored and
adriaanm
committed
caseclass->product
1 parent c994283 commit e9decad

File tree

9 files changed

+51
-71
lines changed

9 files changed

+51
-71
lines changed

‎src/library/scala/xml/Comment.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ case class Comment(commentText: String) extends SpecialNode {
4242
override def text = ""
4343

4444
/** appends &quot;<!-- text -->&quot; to this stringbuffer */
45-
def toString(sb: StringBuilder) =
45+
override def toString(sb: StringBuilder) =
4646
sb.append("<!--").append(commentText).append("-->")
4747
}

‎src/library/scala/xml/EntityRef.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ case class EntityRef(entityName: String) extends SpecialNode {
4545
}
4646

4747
/** appends "&amp; entityName;" to this stringbuffer */
48-
def toString(sb: StringBuilder) =
48+
override def toString(sb: StringBuilder) =
4949
sb.append("&").append(entityName).append(";")
5050

5151
}

‎src/library/scala/xml/MetaData.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ abstract class MetaData extends Iterable[MetaData] {
162162
sb.toString()
163163
}
164164

165-
def toString(sb: StringBuilder): Unit = {
165+
def toString(sb: StringBuilder): StringBuilder = {
166166
sb.append(' ')
167167
toString1(sb)
168168
next.toString(sb)

‎src/library/scala/xml/Null.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ case object Null extends MetaData {
6969

7070
override def toString(): String = ""
7171

72-
override def toString(sb: StringBuilder): Unit = {}
72+
override def toString(sb: StringBuilder): StringBuilder = sb
7373

7474
override def wellformed(scope: NamespaceBinding) = true
7575

‎src/library/scala/xml/ProcInstr.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ case class ProcInstr(target:String, proctext:String) extends SpecialNode {
5454
/** appends &quot;&lt;?&quot; target (&quot; &quot;+text)?+&quot;?&gt;&quot;
5555
* to this stringbuffer.
5656
*/
57-
def toString(sb: StringBuilder) = {
57+
override def toString(sb: StringBuilder) = {
5858
sb
5959
.append("<?")
6060
.append(target);

‎src/library/scala/xml/SpecialNode.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ abstract class SpecialNode extends Node with pull.XMLEvent {
2929
/** always empty */
3030
final def child = Nil
3131

32-
final override def toString(): String =
33-
toString(new StringBuilder()).toString()
34-
32+
/** append string representation to the given stringbuffer */
3533
def toString(sb: StringBuilder): StringBuilder
3634

3735
}

‎src/library/scala/xml/dtd/ContentModel.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ sealed abstract class ContentModel {
134134
}
135135

136136
case object PCDATA extends ContentModel {
137-
def toString(sb:StringBuilder): StringBuilder = sb.append("(#PCDATA)");
137+
override def toString(sb:StringBuilder): StringBuilder = sb.append("(#PCDATA)");
138138
}
139139
case object EMPTY extends ContentModel {
140-
def toString(sb:StringBuilder): StringBuilder = sb.append("EMPTY");
140+
override def toString(sb:StringBuilder): StringBuilder = sb.append("EMPTY");
141141
}
142142
case object ANY extends ContentModel {
143-
def toString(sb:StringBuilder): StringBuilder = sb.append("ANY");
143+
override def toString(sb:StringBuilder): StringBuilder = sb.append("ANY");
144144
}
145145
abstract class DFAContentModel extends ContentModel {
146146
import ContentModel.{ ElemName };
@@ -178,7 +178,7 @@ Console.println("ns = "+ns);
178178
}
179179
}
180180
*/
181-
def toString(sb:StringBuilder): StringBuilder = {
181+
override def toString(sb:StringBuilder): StringBuilder = {
182182
sb.append("(#PCDATA|");
183183
//r match {
184184
// case Alt(Eps, rs@_*) => ContentModel.toString(Alt(rs:_*):RegExp, sb);
@@ -207,6 +207,6 @@ case class ELEMENTS(r:ContentModel.RegExp) extends DFAContentModel {
207207
}
208208
}
209209
*/
210-
def toString(sb:StringBuilder): StringBuilder =
210+
override def toString(sb:StringBuilder): StringBuilder =
211211
ContentModel.toString(r, sb);
212212
}

‎src/library/scala/xml/dtd/Decl.scala

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | **
5-
** /____/\___/_/ |_/____/_/ | | **
6-
** |/ **
7-
\* */
2+
** ________ ___ / / ___ Scala API **
3+
** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL **
4+
** __\ \/ /__/ __ |/ /__/ __ | **
5+
** /____/\___/_/ |_/____/_/ | | **
6+
** |/ **
7+
\* */
88

99
// $Id$
1010

@@ -17,13 +17,7 @@ import compat.StringBuilder
1717
abstract class Decl;
1818

1919
abstract class MarkupDecl extends Decl {
20-
21-
final override def toString(): String = {
22-
toString(new StringBuilder()).toString();
23-
}
24-
2520
def toString(sb: StringBuilder): StringBuilder;
26-
2721
}
2822

2923
/** an element declaration
@@ -32,7 +26,7 @@ case class ElemDecl(name: String, contentModel: ContentModel) extends MarkupDecl
3226

3327
//def mixed = ; // to do
3428

35-
def toString(sb: StringBuilder): StringBuilder = {
29+
override def toString(sb: StringBuilder): StringBuilder = {
3630
sb
3731
.append("<!ELEMENT ")
3832
.append(name)
@@ -46,7 +40,7 @@ case class ElemDecl(name: String, contentModel: ContentModel) extends MarkupDecl
4640

4741
case class AttListDecl(name: String, attrs:List[AttrDecl]) extends MarkupDecl with DtdTypeSymbol {
4842

49-
def toString(sb: StringBuilder): StringBuilder = {
43+
override def toString(sb: StringBuilder): StringBuilder = {
5044
sb
5145
.append("<!ATTLIST ")
5246
.append(name)
@@ -61,10 +55,10 @@ case class AttListDecl(name: String, attrs:List[AttrDecl]) extends MarkupDecl wi
6155
*/
6256
case class AttrDecl( name:String, tpe:String, default:DefaultDecl ) {
6357

64-
final override def toString(): String =
58+
override def toString(): String =
6559
toString(new StringBuilder()).toString();
6660

67-
final def toString(sb: StringBuilder): StringBuilder = {
61+
def toString(sb: StringBuilder): StringBuilder = {
6862
sb.append(" ").append( name ).append(' ').append( tpe ).append(' ');
6963
default.toString(sb)
7064
}
@@ -77,40 +71,36 @@ abstract class EntityDecl extends MarkupDecl;
7771
/** a parsed general entity declaration */
7872
case class ParsedEntityDecl( name:String, entdef:EntityDef ) extends EntityDecl {
7973

80-
final def toString(sb: StringBuilder): StringBuilder = {
74+
override def toString(sb: StringBuilder): StringBuilder = {
8175
sb.append("<!ENTITY ").append( name ).append(' ');
8276
entdef.toString(sb).append('>');
8377
}
8478
}
8579

8680
/** a parameter entity declaration */
8781
case class ParameterEntityDecl(name: String, entdef: EntityDef) extends EntityDecl {
88-
89-
final def toString(sb: StringBuilder): StringBuilder = {
82+
override def toString(sb: StringBuilder): StringBuilder = {
9083
sb.append("<!ENTITY % ").append( name ).append(' ');
9184
entdef.toString(sb).append('>');
9285
}
9386
}
9487

9588
/** an unparsed entity declaration */
9689
case class UnparsedEntityDecl( name:String, extID:ExternalID, notation:String ) extends EntityDecl {
97-
final def toString(sb: StringBuilder): StringBuilder = {
90+
override def toString(sb: StringBuilder): StringBuilder = {
9891
sb.append("<!ENTITY ").append( name ).append(' ');
9992
extID.toString(sb).append(" NDATA ").append(notation).append('>');
10093
}
10194
}
10295
/** a notation declaration */
10396
case class NotationDecl( name:String, extID:ExternalID ) extends MarkupDecl {
104-
final def toString(sb: StringBuilder): StringBuilder = {
97+
override def toString(sb: StringBuilder): StringBuilder = {
10598
sb.append("<!NOTATION ").append( name ).append(' ');
10699
extID.toString(sb);
107100
}
108101
}
109102

110103
abstract class EntityDef {
111-
final override def toString(): String =
112-
toString(new StringBuilder()).toString();
113-
114104
def toString(sb: StringBuilder): StringBuilder;
115105
}
116106

@@ -135,13 +125,13 @@ case class IntDef(value:String) extends EntityDef {
135125
}
136126
validateValue();
137127

138-
final def toString(sb: StringBuilder): StringBuilder =
128+
override def toString(sb: StringBuilder): StringBuilder =
139129
Utility.appendQuoted(value, sb);
140130

141131
}
142132

143133
case class ExtDef(extID:ExternalID) extends EntityDef {
144-
final def toString(sb: StringBuilder): StringBuilder =
134+
override def toString(sb: StringBuilder): StringBuilder =
145135
extID.toString(sb);
146136
}
147137

@@ -152,7 +142,7 @@ case class PEReference(ent:String) extends MarkupDecl {
152142
if( !Utility.isName( ent ))
153143
throw new IllegalArgumentException("ent must be an XML Name");
154144

155-
final def toString(sb: StringBuilder): StringBuilder =
145+
override def toString(sb: StringBuilder): StringBuilder =
156146
sb.append('%').append(ent).append(';');
157147
}
158148

@@ -165,20 +155,20 @@ abstract class DefaultDecl {
165155
}
166156

167157
case object REQUIRED extends DefaultDecl {
168-
final override def toString(): String = "#REQUIRED";
169-
final def toString(sb:StringBuilder) = sb.append("#REQUIRED");
158+
override def toString(): String = "#REQUIRED";
159+
override def toString(sb:StringBuilder) = sb.append("#REQUIRED");
170160
}
171161

172162
case object IMPLIED extends DefaultDecl {
173-
final override def toString(): String = "#IMPLIED";
174-
final def toString(sb:StringBuilder) = sb.append("#IMPLIED");
163+
override def toString(): String = "#IMPLIED";
164+
override def toString(sb:StringBuilder) = sb.append("#IMPLIED");
175165
}
176166

177167
case class DEFAULT(fixed: Boolean, attValue:String) extends DefaultDecl {
178-
final override def toString(): String =
168+
override def toString(): String =
179169
toString(new StringBuilder()).toString();
180170

181-
final def toString(sb:StringBuilder): StringBuilder = {
171+
override def toString(sb:StringBuilder): StringBuilder = {
182172
if(fixed)
183173
sb.append("#FIXED ");
184174
Utility.appendEscapedQuoted( attValue, sb );

‎src/library/scala/xml/dtd/ExternalID.scala

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// $Id$
1010

1111

12-
package scala.xml.dtd;
12+
package scala.xml.dtd
1313

1414

1515
import compat.StringBuilder
@@ -24,12 +24,12 @@ import compat.StringBuilder
2424
abstract class ExternalID {
2525

2626
/** returns "PUBLIC "+publicLiteral+" SYSTEM "+systemLiteral */
27-
override def toString(): String;
27+
override def toString(): String
2828

2929
/** returns "PUBLIC "+publicLiteral+" SYSTEM "+systemLiteral */
30-
def toString(sb: StringBuilder): StringBuilder;
30+
def toString(sb: StringBuilder): StringBuilder
3131

32-
def systemId: String;
32+
def systemId: String
3333

3434
}
3535

@@ -44,13 +44,13 @@ case class SystemID( systemId:String ) extends ExternalID with parsing.TokenTest
4444
if( !checkSysID( systemId ) )
4545
throw new IllegalArgumentException(
4646
"can't use both \" and ' in systemLiteral"
47-
);
47+
)
4848
/** returns " SYSTEM "+systemLiteral */
49-
final override def toString() =
50-
Utility.systemLiteralToString( systemId );
49+
override def toString() =
50+
Utility.systemLiteralToString( systemId )
5151

52-
final def toString(sb: StringBuilder): StringBuilder =
53-
Utility.systemLiteralToString( sb, systemId );
52+
override def toString(sb: StringBuilder): StringBuilder =
53+
Utility.systemLiteralToString( sb, systemId )
5454
}
5555

5656

@@ -61,38 +61,30 @@ case class SystemID( systemId:String ) extends ExternalID with parsing.TokenTest
6161
* @param systemLiteral (can be null for notation pubIDs) the system identifier literal
6262
**/
6363
case class PublicID( publicId:String, systemId:String ) extends ExternalID with parsing.TokenTests{
64-
//Console.println("constructing PublicID \""+publicLiteral+"\" "+systemLiteral);
65-
66-
//Console.println("util returns "+checkPubID( publicLiteral ));
6764

6865
if( !checkPubID( publicId ))
6966
throw new IllegalArgumentException(
7067
"publicId must consist of PubidChars"
71-
);
68+
)
7269
if( systemId != null && !checkSysID( systemId ) )
7370
throw new IllegalArgumentException(
7471
"can't use both \" and ' in systemId"
75-
);
72+
)
7673

7774
/** the constant "#PI" */
78-
final def label = "#PI";
75+
def label = "#PI"
7976

8077
/** always empty */
81-
final def attribute = Node.NoAttributes;
78+
def attribute = Node.NoAttributes
8279

8380
/** always empty */
84-
final def child = Nil;
85-
86-
/** returns "PUBLIC "+publicId+" SYSTEM "+systemId */
87-
final override def toString(): String = {
88-
toString(new StringBuilder()).toString();
89-
}
81+
def child = Nil
9082

9183
/** appends "PUBLIC "+publicId+" SYSTEM "+systemId to argument */
92-
final def toString(sb: StringBuilder): StringBuilder = {
93-
Utility.publicLiteralToString( sb, publicId ).append(' ');
84+
override def toString(sb: StringBuilder): StringBuilder = {
85+
Utility.publicLiteralToString( sb, publicId ).append(' ')
9486
if(systemId!=null)
95-
Utility.systemLiteralToString( sb, systemId );
87+
Utility.systemLiteralToString( sb, systemId )
9688
else
9789
sb
9890
}

0 commit comments

Comments
 (0)