summaryrefslogtreecommitdiff
path: root/src/manual
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2014-02-13 22:13:23 -0800
committerSom Snytt <som.snytt@gmail.com>2014-02-14 13:29:16 -0800
commit37f822eb66dc18a2b3bfdaa672081b6f08ef5688 (patch)
treedc29d030f6d3dc6710d459ede604cbcff2e31c6f /src/manual
parentd4f5abf9002fd617e871d1f20fdcf531b38b26e1 (diff)
downloadscala-37f822eb66dc18a2b3bfdaa672081b6f08ef5688.tar.gz
scala-37f822eb66dc18a2b3bfdaa672081b6f08ef5688.tar.bz2
scala-37f822eb66dc18a2b3bfdaa672081b6f08ef5688.zip
SI-7711 Do not emit extra argv in script body
Take away `argv` and make `args` the standard parameter name. This is a quick fix to avoid "unused local" lint error. All the examples use `args`; in particular, "Step 4. Write some Scala scripts" in "Programming in Scala" uses `args`. I see the footnote there is also where Odersky concatenation is specified, `"Hello, "+ args(0) +"!"` with no space next to the literals. Also removes `argv` from `StdNames`. Was torn whether just to add `argc`. Maybe start a new project to house Names, emeritus.
Diffstat (limited to 'src/manual')
-rw-r--r--src/manual/scala/man1/scala.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala
index 6b3be8b77f..92d9c59cca 100644
--- a/src/manual/scala/man1/scala.scala
+++ b/src/manual/scala/man1/scala.scala
@@ -215,7 +215,7 @@ object scala extends Command {
"exec scala \"$0\" \"$@\"\n" +
"!#\n" +
"Console.println(\"Hello, world!\")\n" +
- "argv.toList foreach Console.println"),
+ "args.toList foreach Console.println"),
"Here is a complete Scala script for MS Windows: ",
@@ -226,7 +226,7 @@ object scala extends Command {
"goto :eof\n" +
"::!#\n" +
"Console.println(\"Hello, world!\")\n" +
- "argv.toList foreach Console.println"),
+ "args.toList foreach Console.println"),
"If you want to use the compilation cache to speed up multiple executions " +
"of the script, then add " & Mono("-savecompiled") & " to the scala " +
@@ -237,7 +237,7 @@ object scala extends Command {
"exec scala -savecompiled \"$0\" \"$@\"\n" +
"!#\n" +
"Console.println(\"Hello, world!\")\n" +
- "argv.toList foreach Console.println"))
+ "args.toList foreach Console.println"))
val exitStatus = Section("EXIT STATUS",