Note require' of a main' submodule for -t', -l', and `-p'

In the output of `racket -h' and in the command-line docs.

Merge to v5.3
(cherry picked from commit 7d894bfb63)
This commit is contained in:
Matthew Flatt 2012-07-25 12:52:46 -06:00 committed by Ryan Culpepper
parent 798ee0a3c5
commit b3d6a4f3af
2 changed files with 18 additions and 12 deletions

View File

@ -139,22 +139,27 @@ flags:
evaluated from standard input.} evaluated from standard input.}
@item{@FlagFirst{t} @nonterm{file} or @DFlagFirst{require} @item{@FlagFirst{t} @nonterm{file} or @DFlagFirst{require}
@nonterm{file} : @racket[require]s @nonterm{file}.} @nonterm{file} : @racket[require]s @nonterm{file}, and then
@racket[require]s @racket[(submod (file @#,nontermstr{file})
main)] if available.}
@item{@FlagFirst{l} @nonterm{path} or @DFlagFirst{lib} @item{@FlagFirst{l} @nonterm{path} or @DFlagFirst{lib}
@nonterm{path} : @racket[require]s @racket[(lib @nonterm{path} : @racket[require]s @racket[(lib
@#,nontermstr{path})].} @#,nontermstr{path})], and then @racket[require]s
@racket[(submod (lib @#,nontermstr{path}) main)] if available.}
@item{@FlagFirst{p} @nonterm{package} : @item{@FlagFirst{p} @nonterm{package} :
@racket[require]s @racket[(planet @#,nontermstr{package})]. @racket[require]s @racket[(planet @#,nontermstr{package})],
and then
@margin-note{Despite its name, @DFlag{script} is not usually @racket[require]s @racket[(submod (planet @#,nontermstr{package})
used for Unix scripts. See @guidesecref["scripts"] for more main)] if available.}
information on scripts.}}
@item{@FlagFirst{r} @nonterm{file} or @DFlagFirst{script} @item{@FlagFirst{r} @nonterm{file} or @DFlagFirst{script}
@nonterm{file} : @racket[load]s @nonterm{file} as a @nonterm{file} : @racket[load]s @nonterm{file}
script. This flag is like @Flag{t} @nonterm{file} plus @margin-note*{Despite its name, @DFlag{script} is not usually
used for Unix scripts. See @guidesecref["scripts"] for more
information on scripts.}
as a script. This flag is like @Flag{t} @nonterm{file} plus
@Flag{N} @nonterm{file} to set the program name and @Flag{-} @Flag{N} @nonterm{file} to set the program name and @Flag{-}
to cause all further command-line elements to be treated as to cause all further command-line elements to be treated as
non-flag arguments.} non-flag arguments.}

View File

@ -1430,13 +1430,14 @@ static int run_from_cmd_line(int argc, char *_argv[],
" File and expression options:\n" " File and expression options:\n"
" -e <exprs>, --eval <exprs> : Evaluate <exprs>, prints results\n" " -e <exprs>, --eval <exprs> : Evaluate <exprs>, prints results\n"
" -f <file>, --load <file> : Like -e '(load \"<file>\")' without printing\n" " -f <file>, --load <file> : Like -e '(load \"<file>\")' without printing\n"
" -t <file>, --require <file> : Like -e '(require (file \"<file>\"))'\n" " -t <file>, --require <file> : Like -e '(require (file \"<file>\"))' [*]\n"
" -l <path>, --lib <path> : Like -e '(require (lib \"<path>\"))'\n" " -l <path>, --lib <path> : Like -e '(require (lib \"<path>\"))' [*]\n"
" -p <package> : Like -e '(require (planet \"<package>\")'\n" " -p <package> : Like -e '(require (planet \"<package>\")' [*]\n"
" -r <file>, --script <file> : Same as -f <file> -N <file> --\n" " -r <file>, --script <file> : Same as -f <file> -N <file> --\n"
" -u <file>, --require-script <file> : Same as -t <file> -N <file> --\n" " -u <file>, --require-script <file> : Same as -t <file> -N <file> --\n"
" -k <n> <m> <p> : Load executable-embedded code from offset <n> to <p>\n" " -k <n> <m> <p> : Load executable-embedded code from offset <n> to <p>\n"
" -m, --main : Call `main' with command-line arguments, print results\n" " -m, --main : Call `main' with command-line arguments, print results\n"
" [*] Also `require's a `main' submodule, if any\n"
" Interaction options:\n" " Interaction options:\n"
" -i, --repl : Run interactive read-eval-print loop; implies -v\n" " -i, --repl : Run interactive read-eval-print loop; implies -v\n"
" -n, --no-lib : Skip `(require (lib \"<init-lib>\"))' for -i/-e/-f/-r\n" " -n, --no-lib : Skip `(require (lib \"<init-lib>\"))' for -i/-e/-f/-r\n"