Skip to content

Commit 3d44557

Browse files
authored
Merge pull request #2247 from ntrel/expr-seq
[trivial] Fix using *sequence* in expression.dd merged-on-behalf-of: MetaLang <MetaLang@users.noreply.github.com>
2 parents 1954824 + df0aea3 commit 3d44557

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

spec/expression.dd

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -955,18 +955,18 @@ $(GNAME IndexExpression):
955955

956956
$(P $(I PostfixExpression) is evaluated. If $(I PostfixExpression) is an
957957
expression of type static array or dynamic array, the symbol $(DOLLAR) is set to
958-
be the the number of elements in the array. If $(I PostfixExpression) is an $(I
959-
ExpressionTuple), the symbol $(DOLLAR) is set to be the the number of elements
960-
in the tuple. A new declaration scope is created for the evaluation of the
958+
be the number of elements in the array. If $(I PostfixExpression) is a $(I
959+
ValueSeq), the symbol $(DOLLAR) is set to be the number of elements
960+
in the sequence. A new declaration scope is created for the evaluation of the
961961
$(GLINK ArgumentList) and $(DOLLAR) appears in that scope only.)
962962

963-
$(P If $(I PostfixExpression) is an $(I ExpressionTuple),
963+
$(P If $(I PostfixExpression) is a $(I ValueSeq),
964964
then the $(GLINK ArgumentList) must consist of only one argument,
965965
and that must be statically evaluatable to an integral constant.
966966
That integral constant $(I n) then selects the $(I n)th
967-
expression in the $(I ExpressionTuple), which is the result
967+
expression in the $(I ValueSeq), which is the result
968968
of the $(I IndexExpression).
969-
It is an error if $(I n) is out of bounds of the $(I ExpressionTuple).
969+
It is an error if $(I n) is out of bounds of the $(I ValueSeq).
970970
)
971971

972972
$(H2 $(LNAME2 slice_expressions, Slice Expressions))
@@ -1067,8 +1067,8 @@ type:)
10671067
$(TROW $(D arr[e-a .. e-b]), $(D a - b) $(I if) $(D a >= b))
10681068
)
10691069

1070-
$(P If $(I PostfixExpression) is an $(I ExpressionTuple), then
1071-
the result of the slice is a new $(I ExpressionTuple) formed
1070+
$(P If $(I PostfixExpression) is a $(I ValueSeq), then
1071+
the result of the slice is a new $(I ValueSeq) formed
10721072
from the upper and lower bounds, which must statically evaluate
10731073
to integral constants.
10741074
It is an error if those
@@ -1301,8 +1301,8 @@ $(GNAME ArrayLiteral):
13011301
-------------
13021302

13031303
$(P If any of the arguments in the $(GLINK ArgumentList) are
1304-
an $(I ExpressionTuple), then the elements of the $(I ExpressionTuple)
1305-
are inserted as arguments in place of the tuple.
1304+
a $(I ValueSeq), then the elements of the $(I ValueSeq)
1305+
are inserted as arguments in place of the sequence.
13061306
)
13071307

13081308
$(P Array literals are allocated on the memory managed heap.
@@ -1381,8 +1381,8 @@ $(GNAME ValueExpression):
13811381
---
13821382

13831383
$(P If any of the keys or values in the $(I KeyValuePairs) are
1384-
an $(I ExpressionTuple), then the elements of the $(I ExpressionTuple)
1385-
are inserted as arguments in place of the tuple.
1384+
a $(I ValueSeq), then the elements of the $(I ValueSeq)
1385+
are inserted as arguments in place of the sequence.
13861386
)
13871387

13881388
$(H3 $(LNAME2 function_literals, Function Literals))
@@ -2001,15 +2001,15 @@ void foo()
20012001
$(TROW $(D union), $(I Type))
20022002
$(TROW $(D class), $(I Type))
20032003
$(TROW $(D interface), $(I Type))
2004-
$(TROW $(D super), $(I TypeTuple) of base classes and interfaces)
2004+
$(TROW $(D super), $(I TypeSeq) of base classes and interfaces)
20052005
$(TROW $(D enum), the base type of the enum)
2006-
$(TROW $(D function), $(ARGS $(I TypeTuple) of the function parameter types.
2006+
$(TROW $(D function), $(ARGS $(I TypeSeq) of the function parameter types.
20072007
For C- and D-style variadic functions,
20082008
only the non-variadic parameters are included.
20092009
For typesafe variadic functions, the $(D ...) is ignored.))
20102010
$(TROW $(CODE delegate), the function type of the delegate)
20112011
$(TROW $(CODE return), $(ARGS the return type of the function, delegate, or function pointer))
2012-
$(TROW $(CODE __parameters), $(ARGS the parameter tuple of a function, delegate, or function pointer.
2012+
$(TROW $(CODE __parameters), $(ARGS the parameter sequence of a function, delegate, or function pointer.
20132013
This includes the parameter types, names, and default values.))
20142014
$(TROW $(D const), $(I Type))
20152015
$(TROW

0 commit comments

Comments
 (0)