Skip to content

Commit 09a56e5

Browse files
authored
Merge pull request #6094 from SethTisue/patch-1
we don't SHOUT our constant names in Scala. let them SHOUT them in Java
2 parents 0d86d2b + af030a7 commit 09a56e5

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

docs/docs/reference/enums/enums.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ enum Planet(mass: Double, radius: Double) {
6666
def surfaceGravity = G * mass / (radius * radius)
6767
def surfaceWeight(otherMass: Double) = otherMass * surfaceGravity
6868

69-
case MERCURY extends Planet(3.303e+23, 2.4397e6)
70-
case VENUS extends Planet(4.869e+24, 6.0518e6)
71-
case EARTH extends Planet(5.976e+24, 6.37814e6)
72-
case MARS extends Planet(6.421e+23, 3.3972e6)
73-
case JUPITER extends Planet(1.9e+27, 7.1492e7)
74-
case SATURN extends Planet(5.688e+26, 6.0268e7)
75-
case URANUS extends Planet(8.686e+25, 2.5559e7)
76-
case NEPTUNE extends Planet(1.024e+26, 2.4746e7)
69+
case Mercury extends Planet(3.303e+23, 2.4397e6)
70+
case Venus extends Planet(4.869e+24, 6.0518e6)
71+
case Earth extends Planet(5.976e+24, 6.37814e6)
72+
case Mars extends Planet(6.421e+23, 3.3972e6)
73+
case Jupiter extends Planet(1.9e+27, 7.1492e7)
74+
case Saturn extends Planet(5.688e+26, 6.0268e7)
75+
case Uranus extends Planet(8.686e+25, 2.5559e7)
76+
case Neptune extends Planet(1.024e+26, 2.4746e7)
7777
}
7878
```
7979

@@ -83,7 +83,7 @@ It is also possible to define an explicit companion object for an enum:
8383
object Planet {
8484
def main(args: Array[String]) = {
8585
val earthWeight = args(0).toDouble
86-
val mass = earthWeight/EARTH.surfaceGravity
86+
val mass = earthWeight / Earth.surfaceGravity
8787
for (p <- enumValues)
8888
println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
8989
}
@@ -107,13 +107,13 @@ trait Enum {
107107
```
108108

109109
Enum values with `extends` clauses get expanded to anonymous class instances.
110-
For instance, the `VENUS` value above would be defined like this:
110+
For instance, the `Venus` value above would be defined like this:
111111

112112
```scala
113-
val VENUS: Planet =
113+
val Venus: Planet =
114114
new Planet(4.869E24, 6051800.0) {
115115
def enumTag: Int = 1
116-
override def toString: String = "VENUS"
116+
override def toString: String = "Venus"
117117
// internal code to register value
118118
}
119119
```

0 commit comments

Comments
 (0)