d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh(1): Fix "reserved word" vs "keyword" inconsistency.

Browse Source 
Use "keyword" everywhere, like the output of the 'type' builtin, and only
mention "reserved word" once to say it is the same thing.
This commit is contained in:
jilles 2010-05-09 22:03:18 +00:00
parent 7bcd31a958
commit 48c5cd85a6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/sh/sh.1
View File

@ -32,7 +32,7 @@
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd April 5, 2010 .Dd May 9, 2010
.Dt SH 1 .Dt SH 1
.Os .Os
.Sh NAME .Sh NAME
@ -415,11 +415,11 @@ character, with the exception of the newline character
.Pq Ql \en . .Pq Ql \en .
A backslash preceding a newline is treated as a line continuation. A backslash preceding a newline is treated as a line continuation.
.El .El
.Ss Reserved Words .Ss Keywords
Reserved words are words that have special meaning to the Keywords or reserved words are words that have special meaning to the
shell and are recognized at the beginning of a line and shell and are recognized at the beginning of a line and
after a control operator. after a control operator.
The following are reserved words: The following are keywords:
.Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center .Bl -column "doneXX" "elifXX" "elseXX" "untilXX" "whileX" -offset center
.It Li \&! Ta { Ta } Ta Ic case Ta Ic do .It Li \&! Ta { Ta } Ta Ic case Ta Ic do
.It Ic done Ta Ic elif Ta Ic else Ta Ic esac Ta Ic fi .It Ic done Ta Ic elif Ta Ic else Ta Ic esac Ta Ic fi
@ -429,8 +429,8 @@ The following are reserved words:
An alias is a name and corresponding value set using the An alias is a name and corresponding value set using the
.Ic alias .Ic alias
built-in command. built-in command.
Whenever a reserved word may occur (see above), Whenever a keyword may occur (see above),
and after checking for reserved words, the shell and after checking for keywords, the shell
checks the word to see if it matches an alias. checks the word to see if it matches an alias.
If it does, it replaces it in the input stream with its value. If it does, it replaces it in the input stream with its value.
For example, if there is an alias called For example, if there is an alias called
@ -469,7 +469,7 @@ of this man page (refer to the BNF in the
document). document).
Essentially though, a line is read and if Essentially though, a line is read and if
the first word of the line (or after a control operator) the first word of the line (or after a control operator)
is not a reserved word, then the shell has recognized a is not a keyword, then the shell has recognized a
simple command. simple command.
Otherwise, a complex command or some Otherwise, a complex command or some
other special construct may have been recognized. other special construct may have been recognized.
@ -695,7 +695,7 @@ Signal numbers are defined in the header file
.In sys/signal.h . .In sys/signal.h .
.Ss Complex Commands .Ss Complex Commands
Complex commands are combinations of simple commands Complex commands are combinations of simple commands
with control operators or reserved words, together creating a larger complex with control operators or keywords, together creating a larger complex
command. command.
More generally, a command is one of the following: More generally, a command is one of the following:
.Bl -item -offset indent .Bl -item -offset indent
@ -739,7 +739,7 @@ operators that are part of the command.
If the pipeline is not in the background (discussed later), If the pipeline is not in the background (discussed later),
the shell waits for all commands to complete. the shell waits for all commands to complete.
.Pp .Pp
If the reserved word If the keyword
.Ic !\& .Ic !\&
does not precede the pipeline, the does not precede the pipeline, the
exit status is the exit status of the last command specified exit status is the exit status of the last command specified