diff options
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocGenerator.scala | 10 | ||||
-rw-r--r-- | test/files/res/bug597.check (renamed from test/files/resident/bug597.check) | 0 | ||||
-rw-r--r-- | test/files/res/bug597.res (renamed from test/files/resident/bug597.res) | 0 | ||||
-rw-r--r-- | test/files/res/bug597/Main.scala (renamed from test/files/resident/bug597/Main.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug597/Test.scala (renamed from test/files/resident/bug597/Test.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug687.check (renamed from test/files/resident/bug687.check) | 0 | ||||
-rw-r--r-- | test/files/res/bug687.res (renamed from test/files/resident/bug687.res) | 0 | ||||
-rw-r--r-- | test/files/res/bug687/QueryA.scala (renamed from test/files/resident/bug687/QueryA.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug687/QueryB.scala (renamed from test/files/resident/bug687/QueryB.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug722.check (renamed from test/files/resident/bug722.check) | 0 | ||||
-rw-r--r-- | test/files/res/bug722.res (renamed from test/files/resident/bug722.res) | 0 | ||||
-rw-r--r-- | test/files/res/bug722/IfElse.scala (renamed from test/files/resident/bug722/IfElse.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug722/Parser.scala (renamed from test/files/resident/bug722/Parser.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug722/ScanBased.scala (renamed from test/files/resident/bug722/ScanBased.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug735.check (renamed from test/files/resident/bug735.check) | 0 | ||||
-rw-r--r-- | test/files/res/bug735.res (renamed from test/files/resident/bug735.res) | 0 | ||||
-rw-r--r-- | test/files/res/bug735/ScalaExpressions.scala (renamed from test/files/resident/bug735/ScalaExpressions.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug735/ScalaTyper.scala (renamed from test/files/resident/bug735/ScalaTyper.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug743.check (renamed from test/files/resident/bug743.check) | 0 | ||||
-rw-r--r-- | test/files/res/bug743.res (renamed from test/files/resident/bug743.res) | 0 | ||||
-rw-r--r-- | test/files/res/bug743/BracesXXX.scala (renamed from test/files/resident/bug743/BracesXXX.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug743/ParserXXX.scala (renamed from test/files/resident/bug743/ParserXXX.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug785.check (renamed from test/files/resident/bug785.check) | 0 | ||||
-rw-r--r-- | test/files/res/bug785.res (renamed from test/files/resident/bug785.res) | 0 | ||||
-rw-r--r-- | test/files/res/bug785/ScalaNewTyper.scala (renamed from test/files/resident/bug785/ScalaNewTyper.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug785/ScalaTrees.scala (renamed from test/files/resident/bug785/ScalaTrees.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug831.check (renamed from test/files/resident/bug831.check) | 0 | ||||
-rw-r--r-- | test/files/res/bug831.res (renamed from test/files/resident/bug831.res) | 0 | ||||
-rw-r--r-- | test/files/res/bug831/NewScalaParserXXX.scala (renamed from test/files/resident/bug831/NewScalaParserXXX.scala) | 0 | ||||
-rw-r--r-- | test/files/res/bug831/NewScalaTestXXX.scala (renamed from test/files/resident/bug831/NewScalaTestXXX.scala) | 0 |
30 files changed, 7 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 9c66dc59eb..c749c922da 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -989,7 +989,10 @@ abstract class DocGenerator extends Models { * </p> */""" } - def numericValDescr(sym: Symbol) = """ + def numericValDescr(sym: Symbol) = { + val maxValue = "MAX_" + sym.name.toString().toUpperCase() + val minValue = "MIN_" + sym.name.toString().toUpperCase(); + """ /** <p> * Class <code>""" + sym.name + """ </code> belongs to the value * classes whose instances are not represented as objects by the @@ -997,10 +1000,11 @@ abstract class DocGenerator extends Models { * <a href="AnyVal.html"><code>AnyVal</code></a>. * </p> * <p> - * Value <code>MAX_""" + sym.name.toString().toUpperCase() + """</code> - * in defined in object <a href="compat/Math$object.html">scala.compat.Math</a>. + * Values <code>""" + maxValue + """</code> and <code>""" + minValue + """</code> + * are in defined in object <a href="compat/Math$object.html">scala.compat.Math</a>. * </p> */""" + } new PrimitiveContentFrame { def sym = definitions.ByteClass def descr = numericValDescr(sym) diff --git a/test/files/resident/bug597.check b/test/files/res/bug597.check index ed46e87f5d..ed46e87f5d 100644 --- a/test/files/resident/bug597.check +++ b/test/files/res/bug597.check diff --git a/test/files/resident/bug597.res b/test/files/res/bug597.res index 0db355cd0f..0db355cd0f 100644 --- a/test/files/resident/bug597.res +++ b/test/files/res/bug597.res diff --git a/test/files/resident/bug597/Main.scala b/test/files/res/bug597/Main.scala index 24d1327135..24d1327135 100644 --- a/test/files/resident/bug597/Main.scala +++ b/test/files/res/bug597/Main.scala diff --git a/test/files/resident/bug597/Test.scala b/test/files/res/bug597/Test.scala index 2f63f46c3d..2f63f46c3d 100644 --- a/test/files/resident/bug597/Test.scala +++ b/test/files/res/bug597/Test.scala diff --git a/test/files/resident/bug687.check b/test/files/res/bug687.check index 7bea791077..7bea791077 100644 --- a/test/files/resident/bug687.check +++ b/test/files/res/bug687.check diff --git a/test/files/resident/bug687.res b/test/files/res/bug687.res index ba8ba76995..ba8ba76995 100644 --- a/test/files/resident/bug687.res +++ b/test/files/res/bug687.res diff --git a/test/files/resident/bug687/QueryA.scala b/test/files/res/bug687/QueryA.scala index 2899f7e196..2899f7e196 100644 --- a/test/files/resident/bug687/QueryA.scala +++ b/test/files/res/bug687/QueryA.scala diff --git a/test/files/resident/bug687/QueryB.scala b/test/files/res/bug687/QueryB.scala index ce93005bb3..ce93005bb3 100644 --- a/test/files/resident/bug687/QueryB.scala +++ b/test/files/res/bug687/QueryB.scala diff --git a/test/files/resident/bug722.check b/test/files/res/bug722.check index ed46e87f5d..ed46e87f5d 100644 --- a/test/files/resident/bug722.check +++ b/test/files/res/bug722.check diff --git a/test/files/resident/bug722.res b/test/files/res/bug722.res index dbc785c171..dbc785c171 100644 --- a/test/files/resident/bug722.res +++ b/test/files/res/bug722.res diff --git a/test/files/resident/bug722/IfElse.scala b/test/files/res/bug722/IfElse.scala index a10607a38d..a10607a38d 100644 --- a/test/files/resident/bug722/IfElse.scala +++ b/test/files/res/bug722/IfElse.scala diff --git a/test/files/resident/bug722/Parser.scala b/test/files/res/bug722/Parser.scala index 6d9739ed04..6d9739ed04 100644 --- a/test/files/resident/bug722/Parser.scala +++ b/test/files/res/bug722/Parser.scala diff --git a/test/files/resident/bug722/ScanBased.scala b/test/files/res/bug722/ScanBased.scala index fcb853f96d..fcb853f96d 100644 --- a/test/files/resident/bug722/ScanBased.scala +++ b/test/files/res/bug722/ScanBased.scala diff --git a/test/files/resident/bug735.check b/test/files/res/bug735.check index ed46e87f5d..ed46e87f5d 100644 --- a/test/files/resident/bug735.check +++ b/test/files/res/bug735.check diff --git a/test/files/resident/bug735.res b/test/files/res/bug735.res index d477e6fd47..d477e6fd47 100644 --- a/test/files/resident/bug735.res +++ b/test/files/res/bug735.res diff --git a/test/files/resident/bug735/ScalaExpressions.scala b/test/files/res/bug735/ScalaExpressions.scala index aacc412b68..aacc412b68 100644 --- a/test/files/resident/bug735/ScalaExpressions.scala +++ b/test/files/res/bug735/ScalaExpressions.scala diff --git a/test/files/resident/bug735/ScalaTyper.scala b/test/files/res/bug735/ScalaTyper.scala index 29c4bb37cb..29c4bb37cb 100644 --- a/test/files/resident/bug735/ScalaTyper.scala +++ b/test/files/res/bug735/ScalaTyper.scala diff --git a/test/files/resident/bug743.check b/test/files/res/bug743.check index ed46e87f5d..ed46e87f5d 100644 --- a/test/files/resident/bug743.check +++ b/test/files/res/bug743.check diff --git a/test/files/resident/bug743.res b/test/files/res/bug743.res index f1dd2462e4..f1dd2462e4 100644 --- a/test/files/resident/bug743.res +++ b/test/files/res/bug743.res diff --git a/test/files/resident/bug743/BracesXXX.scala b/test/files/res/bug743/BracesXXX.scala index 8a2416caa8..8a2416caa8 100644 --- a/test/files/resident/bug743/BracesXXX.scala +++ b/test/files/res/bug743/BracesXXX.scala diff --git a/test/files/resident/bug743/ParserXXX.scala b/test/files/res/bug743/ParserXXX.scala index 6ecf13c1e1..6ecf13c1e1 100644 --- a/test/files/resident/bug743/ParserXXX.scala +++ b/test/files/res/bug743/ParserXXX.scala diff --git a/test/files/resident/bug785.check b/test/files/res/bug785.check index ed46e87f5d..ed46e87f5d 100644 --- a/test/files/resident/bug785.check +++ b/test/files/res/bug785.check diff --git a/test/files/resident/bug785.res b/test/files/res/bug785.res index 7e5da1c453..7e5da1c453 100644 --- a/test/files/resident/bug785.res +++ b/test/files/res/bug785.res diff --git a/test/files/resident/bug785/ScalaNewTyper.scala b/test/files/res/bug785/ScalaNewTyper.scala index fb955572ed..fb955572ed 100644 --- a/test/files/resident/bug785/ScalaNewTyper.scala +++ b/test/files/res/bug785/ScalaNewTyper.scala diff --git a/test/files/resident/bug785/ScalaTrees.scala b/test/files/res/bug785/ScalaTrees.scala index ade58e65c6..ade58e65c6 100644 --- a/test/files/resident/bug785/ScalaTrees.scala +++ b/test/files/res/bug785/ScalaTrees.scala diff --git a/test/files/resident/bug831.check b/test/files/res/bug831.check index ed46e87f5d..ed46e87f5d 100644 --- a/test/files/resident/bug831.check +++ b/test/files/res/bug831.check diff --git a/test/files/resident/bug831.res b/test/files/res/bug831.res index 0cc6c398ab..0cc6c398ab 100644 --- a/test/files/resident/bug831.res +++ b/test/files/res/bug831.res diff --git a/test/files/resident/bug831/NewScalaParserXXX.scala b/test/files/res/bug831/NewScalaParserXXX.scala index 88c81637f0..88c81637f0 100644 --- a/test/files/resident/bug831/NewScalaParserXXX.scala +++ b/test/files/res/bug831/NewScalaParserXXX.scala diff --git a/test/files/resident/bug831/NewScalaTestXXX.scala b/test/files/res/bug831/NewScalaTestXXX.scala index e5cc79970f..e5cc79970f 100644 --- a/test/files/resident/bug831/NewScalaTestXXX.scala +++ b/test/files/res/bug831/NewScalaTestXXX.scala |