Remove unused definitions of terms 'formal argument', 'actual argument', and

'actual parameter'. Unify uses of 'formal parameter' and 'parameter' to all use
the vastly more common term 'parameter' and remove the definition of 'formal
parameter'.

Author: zygoloid

source/declarators.tex

@@ -1603,7 +1603,7 @@
 
 \pnum
 An identifier can optionally be provided as a parameter name;
-if present in a function definition (\ref{dcl.fct.def}), it names a parameter (sometimes called ``formal argument'').
+if present in a function definition (\ref{dcl.fct.def}), it names a parameter.
 \enternote
 In particular, parameter names are also optional in function definitions
 and names used for a parameter in different declarations and the definition

source/exceptions.tex

@@ -57,7 +57,7 @@
 \end{bnf}
 
 The optional \grammarterm{attribute-specifier-seq} in an \grammarterm{exception-declaration}
-appertains to the formal parameter of the catch clause~(\ref{except.handle}).
+appertains to the parameter of the catch clause~(\ref{except.handle}).
 
 \pnum
 \indextext{exception handling!try block}%
@@ -614,7 +614,7 @@
 
 \pnum
 A handler is considered active when initialization is complete for
-the formal parameter (if any) of the catch clause.
+the parameter (if any) of the catch clause.
 \enternote
 The stack will have been unwound at that point.
 \exitnote

source/expressions.tex

@@ -1309,7 +1309,6 @@
 \pnum
 \indextext{function~argument|see{argument}}%
 \indextext{function~parameter|see{parameter}}%
-\indextext{formal~argument|see{parameter}}%
 \indextext{initialization!parameter}%
 When a function is called, each parameter~(\ref{dcl.fct}) shall be
 initialized~(\ref{dcl.init},~\ref{class.copy},~\ref{class.ctor}) with

source/intro.tex

@@ -119,30 +119,22 @@
 \indexdefn{argument}%
 \indexdefn{argument!function call expression}
 \definition{argument}{defns.argument}
-actual argument\\
-actual parameter\\
 <function call expression> expression in the comma-separated list bounded by the parentheses
 
 \indexdefn{argument}%
 \indexdefn{argument!function-like macro}%
 \definition{argument}{defns.argument.macro}
-actual argument\\
-actual parameter\\
 <function-like macro> sequence of preprocessing tokens in the
 comma-separated list bounded by the parentheses
 
 \indexdefn{argument}%
 \indexdefn{argument!throw expression}%
 \definition{argument}{defns.argument.throw}
-actual argument\\
-actual parameter\\
 <throw expression> the operand of \tcode{throw}
 
 \indexdefn{argument}%
 \indexdefn{argument!template instantiation}%
 \definition{argument}{defns.argument.templ}
-actual argument\\
-actual parameter\\
 <template instantiation>
 expression,
 \grammarterm{type-id}  or \grammarterm{template-name} in the comma-separated
@@ -205,26 +197,20 @@
 \indexdefn{parameter!function}%
 \indexdefn{parameter!catch clause}%
 \definition{parameter}{defns.parameter}
-formal argument\\
-formal parameter\\
 <function or catch clause> object or reference declared as part of a function declaration or
 definition or in the catch clause of an exception handler that
 acquires a value on entry to the function or handler
 
 \indexdefn{parameter}%
 \indexdefn{parameter!function-like macro}%
 \definition{parameter}{defns.parameter.macro}
-formal argument\\
-formal parameter\\
 <function-like macro> identifier from
 the comma-separated list bounded by the parentheses immediately
 following the macro name
 
 \indexdefn{parameter}%
 \indexdefn{parameter!template}%
 \definition{parameter}{defns.parameter.templ}
-formal argument\\
-formal parameter\\
 <template> \grammarterm{template-parameter}
 
 \indexdefn{signature}%

source/iostreams.tex

@@ -91,7 +91,7 @@
 \impldef{behavior of iostream classes when \tcode{traits::pos_type} is not \tcode{streampos} or when \tcode{traits::off_type} is not \tcode{streamoff}}.
 
 \pnum
-In the classes of Clause~\ref{input.output}, a template formal parameter with name
+In the classes of Clause~\ref{input.output}, a template parameter with name
 \tcode{charT} represents a member of the set of types containing \tcode{char}, \tcode{wchar_t},
 and any other implementation-defined character types that satisfy the requirements for
 a character on which any of the iostream components can be instantiated.

source/lib-intro.tex

@@ -435,7 +435,7 @@
 requirements there is a table that specifies an initial set of the valid expressions and
 their semantics. Any generic algorithm (Clause~\ref{algorithms}) that uses the
 well-defined expression requirements is described in terms of the valid expressions for
-its formal type parameters.
+its template type parameters.
 
 \pnum
 Template argument requirements are sometimes referenced by name.

source/locales.tex

@@ -433,21 +433,21 @@
 argument to these functions.
 
 \pnum
-In declarations of facets, a template formal parameter with name
+In declarations of facets, a template parameter with name
 \tcode{InputIterator}
 or
 \tcode{OutputIterator}
 indicates the set of
 all possible specializations on parameters that satisfy the
 requirements of an Input Iterator or an Output Iterator, respectively~(\ref{iterator.requirements}).
-A template formal parameter with name
+A template parameter with name
 \tcode{C}
 represents the set
 of types containing \tcode{char}, \tcode{wchar_t}, and any other implementation-defined
 character types that satisfy
 the requirements for a character on which any of the iostream
 components can be instantiated.
-A template formal parameter with name
+A template parameter with name
 \tcode{International}
 represents the set of all possible specializations on a bool parameter.
 

source/strings.tex

@@ -60,7 +60,7 @@
 that and its related character traits class
 \tcode{Traits}
 are passed as a pair of parameters to the string or iostream template as
-formal parameters
+parameters
 \tcode{charT}
 and
 \tcode{traits}.

source/utilities.tex

@@ -3993,7 +3993,7 @@
 
 \pnum
 \tcode{raw_storage_iterator} is provided to enable algorithms to store their
-results into uninitialized memory. The formal template parameter
+results into uninitialized memory. The template parameter
 \tcode{OutputIterator} is required to have its \tcode{operator*} return an
 object for which \tcode{operator\&} is defined and returns a pointer to
 \tcode{T}, and is also required to satisfy the requirements of an output
@@ -4120,13 +4120,13 @@
 \rSec2[specialized.algorithms]{Specialized algorithms}
 
 \pnum
-All the iterators that are used as formal template parameters in the following
+All the iterators that are used as template parameters in the following
 algorithms are required to  have their \tcode{operator*} return an object
 for which \tcode{operator\&} is defined and returns a pointer to \tcode{T}.
-In the algorithm \tcode{uninitialized_copy}, the formal template parameter
+In the algorithm \tcode{uninitialized_copy}, the template parameter
 \tcode{InputIterator} is required to satisfy the requirements of an input
 iterator~(\ref{input.iterators}). In all of the following algorithms,
-the formal template parameter \tcode{ForwardIterator} is required to satisfy the
+the template parameter \tcode{ForwardIterator} is required to satisfy the
 requirements of a forward iterator~(\ref{forward.iterators}),
 and is required to have the property that no exceptions are thrown
 from increment, assignment, comparison, or indirection through valid iterators.