Skip to content

dtemplate Tuple, add a ctor taking num elements #8554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 2 commits into from Aug 13, 2018
+14 −6
Merged

dtemplate Tuple, add a ctor taking num elements #8554

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bea5621
dtemplate Tuple, add a ctor taking num elements
Aug 10, 2018
292345b
Update DDoc header in detemplate.d to follow the Style Guide
JinShil Aug 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/dmd/dtemplate.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,17 @@ extern (C++) final class Tuple : RootObject
{
Objects objects;

extern (D) this() {}

/**
Params:
numObjects = The initial number of objects.
*/
extern (D) this(size_t numObjects)
{
objects.setDim(numObjects);
}

// kludge for template.isType()
override DYNCAST dyncast() const
{
Expand Down Expand Up @@ -1151,11 +1162,10 @@ extern (C++) final class TemplateDeclaration : ScopeDsymbol
/* The extra initial template arguments
* now form the tuple argument.
*/
auto t = new Tuple();
auto t = new Tuple(ntargs - n);
assert(parameters.dim);
(*dedargs)[parameters.dim - 1] = t;

t.objects.setDim(ntargs - n);
for (size_t i = 0; i < t.objects.dim; i++)
{
t.objects[i] = (*tiargs)[n + i];
Expand Down Expand Up @@ -3727,8 +3737,7 @@ MATCH deduceType(RootObject o, Scope* sc, Type tparam, TemplateParameters* param
else
{
// Create new tuple
auto tup = new Tuple();
tup.objects.setDim(tuple_dim);
auto tup = new Tuple(tuple_dim);
for (size_t i = 0; i < tuple_dim; i++)
{
Parameter arg = Parameter.getNth(t.parameters, nfparams - 1 + i);
Expand Down Expand Up @@ -3905,9 +3914,8 @@ MATCH deduceType(RootObject o, Scope* sc, Type tparam, TemplateParameters* param

/* Create tuple from remaining args
*/
auto vt = new Tuple();
size_t vtdim = (tempdecl.isVariadic() ? t.tempinst.tiargs.dim : t.tempinst.tdtypes.dim) - i;
vt.objects.setDim(vtdim);
auto vt = new Tuple(vtdim);
for (size_t k = 0; k < vtdim; k++)
{
RootObject o;
Expand Down