Skip to content

Commit 1bae2cc

Browse files
committed
[intro.defs] Remove cross-references to main part
Partially addresses ISO/CS 016 (C++20 DIS)
1 parent c3cfa28 commit 1bae2cc

File tree

1 file changed

+33
-36
lines changed

1 file changed

+33
-36
lines changed

source/intro.tex

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,7 @@
121121
\indexdefn{access}%
122122
\definition{access}{defns.access}
123123
\defncontext{execution-time action}
124-
read\iref{conv.lval} or
125-
modify (\ref{expr.ass}, \ref{expr.post.incr}, \ref{expr.pre.incr})
126-
the value of an object
124+
read or modify the value of an object
127125

128126
\begin{defnote}
129127
Only objects of scalar type can be accessed.
@@ -137,29 +135,29 @@
137135
\definition{arbitrary-positional stream}{defns.arbitrary.stream}
138136
\defncontext{library}
139137
\indexdefn{stream!arbitrary-positional}%
140-
stream (described in \ref{input.output}) that can seek to any integral position within
138+
stream that can seek to any integral position within
141139
the length of the stream
142140

143141
\begin{defnote}
144-
Every arbitrary-positional stream is also a repositional stream.
142+
Every arbitrary-positional stream is also a repositional stream\iref{defns.repositional.stream}.
145143
\end{defnote}
146144

147145
\indexdefn{argument}%
148146
\indexdefn{argument!function call expression}
149147
\definition{argument}{defns.argument}
150148
\defncontext{function call expression} expression in the
151-
comma-separated list bounded by the parentheses\iref{expr.call}
149+
comma-separated list bounded by the parentheses
152150

153151
\indexdefn{argument}%
154152
\indexdefn{argument!function-like macro}%
155153
\definition{argument}{defns.argument.macro}
156154
\defncontext{function-like macro} sequence of preprocessing tokens in the
157-
comma-separated list bounded by the parentheses\iref{cpp.replace}
155+
comma-separated list bounded by the parentheses
158156

159157
\indexdefn{argument}%
160158
\indexdefn{argument!throw expression}%
161159
\definition{argument}{defns.argument.throw}
162-
\defncontext{throw expression} operand of \tcode{throw}\iref{expr.throw}
160+
\defncontext{throw expression} operand of \keyword{throw}
163161

164162
\indexdefn{argument}%
165163
\indexdefn{argument!template instantiation}%
@@ -168,7 +166,7 @@
168166
\grammarterm{constant-expression},
169167
\grammarterm{type-id}, or
170168
\grammarterm{id-expression} in the comma-separated
171-
list bounded by the angle brackets\iref{temp.arg}
169+
list bounded by the angle brackets
172170

173171
\indexdefn{block (execution)}%
174172
\definition{block}{defns.block}
@@ -180,7 +178,7 @@
180178
\indexdefn{block (statement)}%
181179
\definition{block}{defns.block.stmt}
182180
\defncontext{statement}
183-
compound statement\iref{stmt.block}
181+
compound statement
184182

185183
\definition{character}{defns.character}
186184
\indexdefn{character}%
@@ -197,7 +195,7 @@
197195
\tcode{char32_t},
198196
and
199197
\tcode{wchar_t}
200-
objects,
198+
objects\iref{basic.fundamental},
201199
but any value that can be represented by a type
202200
that provides the definitions specified in
203201
\ref{strings}, \ref{localization}, \ref{input.output}, or~\ref{re}.
@@ -243,8 +241,8 @@
243241
\indexdefn{constant subexpression}%
244242
expression whose evaluation as subexpression of a
245243
\grammarterm{conditional-expression}
246-
\tcode{CE}\iref{expr.cond} would not prevent \tcode{CE}
247-
from being a core constant expression\iref{expr.const}
244+
\tcode{CE} would not prevent \tcode{CE}
245+
from being a core constant expression
248246

249247
\definition{deadlock}{defns.deadlock}
250248
\defncontext{library}
@@ -266,12 +264,12 @@
266264

267265
\definition{direct-non-list-initialization}{defns.direct-non-list-init}
268266
\indexdefn{direct-non-list-initialization}%
269-
direct-initialization\iref{dcl.init}
270-
that is not list-initialization\iref{dcl.init.list}
267+
direct-initialization
268+
that is not list-initialization
271269

272270
\indexdefn{type!dynamic}%
273271
\definition{dynamic type}{defns.dynamic.type}
274-
\defncontext{glvalue} type of the most derived object\iref{intro.object} to which the
272+
\defncontext{glvalue} type of the most derived object to which the
275273
glvalue refers
276274

277275
\begin{example}
@@ -291,7 +289,7 @@
291289
\indexdefn{expression-equivalent}%
292290
expressions that all have the same effects,
293291
either
294-
are all potentially-throwing\iref{except.spec} or
292+
are all potentially-throwing or
295293
are all not potentially-throwing,
296294
and
297295
either
@@ -345,8 +343,8 @@
345343

346344
\definition{iostream class templates}{defns.iostream.templates}
347345
\defncontext{library}
348-
templates, defined in \ref{input.output},
349-
that take two template arguments
346+
templates that take two template arguments
347+
and are declared in header \libheader{iosfwd}
350348

351349
\begin{defnote}
352350
The arguments are named \tcode{charT} and \tcode{traits}.
@@ -365,7 +363,7 @@
365363
\definition{modifier function}{defns.modifier}
366364
\defncontext{library}
367365
\indexdefn{function!modifier}%
368-
class member function\iref{class.mfct} other than a constructor,
366+
class member function other than a constructor,
369367
assignment operator, or destructor
370368
that alters the state of an object of the class
371369

@@ -402,7 +400,7 @@
402400
\definition{observer function}{defns.observer}
403401
\defncontext{library}
404402
\indexdefn{function!observer}%
405-
class member function\iref{class.mfct} that accesses the state of an object of the class
403+
class member function that accesses the state of an object of the class
406404
but does not alter that state
407405

408406
\begin{defnote}
@@ -495,8 +493,7 @@
495493
\definition{repositional stream}{defns.repositional.stream}
496494
\defncontext{library}
497495
\indexdefn{stream!repositional}%
498-
stream (described in \ref{input.output}) that can seek to a position that was
499-
previously encountered
496+
stream that can seek to a position that was previously encountered
500497

501498
\definition{required behavior}{defns.required.behavior}
502499
\defncontext{library}
@@ -526,7 +523,7 @@
526523
\definition{signature}{defns.signature}
527524
\defncontext{function}
528525
name,
529-
parameter-type-list\iref{dcl.fct},
526+
parameter-type-list,
530527
and enclosing namespace (if any)
531528

532529
\begin{defnote}
@@ -538,32 +535,32 @@
538535
\definition{signature}{defns.signature.friend}
539536
\defncontext{non-template friend function with trailing \grammarterm{requires-clause}}
540537
name,
541-
parameter-type-list\iref{dcl.fct},
538+
parameter-type-list,
542539
enclosing class,
543540
and
544-
trailing \grammarterm{requires-clause}\iref{dcl.decl}
541+
trailing \grammarterm{requires-clause}
545542

546543
\indexdefn{signature}%
547544
\definition{signature}{defns.signature.templ}
548545
\defncontext{function template}
549546
name,
550-
parameter-type-list\iref{dcl.fct},
547+
parameter-type-list,
551548
enclosing namespace (if any),
552549
return type,
553550
\grammarterm{template-head},
554551
and
555-
trailing \grammarterm{requires-clause}\iref{dcl.decl} (if any)
552+
trailing \grammarterm{requires-clause} (if any)
556553

557554
\indexdefn{signature}%
558555
\definition{signature}{defns.signature.templ.friend}
559556
\defncontext{friend function template with constraint involving enclosing template parameters}
560557
name,
561-
parameter-type-list\iref{dcl.fct},
558+
parameter-type-list,
562559
return type,
563560
enclosing class,
564561
\grammarterm{template-head},
565562
and
566-
trailing \grammarterm{requires-clause}\iref{dcl.decl} (if any)
563+
trailing \grammarterm{requires-clause} (if any)
567564

568565
\indexdefn{signature}%
569566
\definition{signature}{defns.signature.spec}
@@ -574,25 +571,25 @@
574571
\definition{signature}{defns.signature.member}
575572
\defncontext{class member function}
576573
name,
577-
parameter-type-list\iref{dcl.fct},
574+
parameter-type-list,
578575
class of which the function is a member,
579576
\cv-qualifiers (if any),
580577
\grammarterm{ref-qualifier} (if any),
581578
and
582-
trailing \grammarterm{requires-clause}\iref{dcl.decl} (if any)
579+
trailing \grammarterm{requires-clause} (if any)
583580

584581
\indexdefn{signature}%
585582
\definition{signature}{defns.signature.member.templ}
586583
\defncontext{class member function template}
587584
name,
588-
parameter-type-list\iref{dcl.fct},
585+
parameter-type-list,
589586
class of which the function is a member,
590587
\cv-qualifiers (if any),
591588
\grammarterm{ref-qualifier} (if any),
592589
return type (if any),
593590
\grammarterm{template-head},
594591
and
595-
trailing \grammarterm{requires-clause}\iref{dcl.decl} (if any)
592+
trailing \grammarterm{requires-clause} (if any)
596593

597594
\indexdefn{signature}%
598595
\definition{signature}{defns.signature.member.spec}
@@ -612,7 +609,7 @@
612609

613610
\indexdefn{type!static}%
614611
\definition{static type}{defns.static.type}
615-
type of an expression\iref{basic.types} resulting from
612+
type of an expression resulting from
616613
analysis of the program without considering execution semantics
617614

618615
\begin{defnote}
@@ -678,7 +675,7 @@
678675
\indexdefn{program!well-formed}%
679676
\definition{well-formed program}{defns.well.formed}
680677
\Cpp{} program constructed according to the syntax rules, diagnosable
681-
semantic rules, and the one-definition rule\iref{basic.def.odr}%
678+
semantic rules, and the one-definition rule%
682679
\indextext{definitions|)}
683680

684681
\rSec0[intro]{General principles}

0 commit comments

Comments
 (0)