diff options
Diffstat (limited to 'gcc/d/dmd/cppmangle.d')
| -rw-r--r-- | gcc/d/dmd/cppmangle.d | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gcc/d/dmd/cppmangle.d b/gcc/d/dmd/cppmangle.d index 7c130e9..fbe9f01 100644 --- a/gcc/d/dmd/cppmangle.d +++ b/gcc/d/dmd/cppmangle.d @@ -534,10 +534,10 @@ private final class CppMangleVisitor : Visitor { /* <template-args> ::= I <template-arg>+ E */ - if (!ti || ti.tiargs.dim <= firstArg) // could happen if std::basic_string is not a template + if (!ti || ti.tiargs.length <= firstArg) // could happen if std::basic_string is not a template return false; buf.writeByte('I'); - foreach (i; firstArg .. ti.tiargs.dim) + foreach (i; firstArg .. ti.tiargs.length) { TemplateDeclaration td = ti.tempdecl.isTemplateDeclaration(); assert(td); @@ -556,7 +556,7 @@ private final class CppMangleVisitor : Visitor buf.writeByte('J'); // argument pack // mangle the rest of the arguments as types - foreach (j; i .. (*ti.tiargs).dim) + foreach (j; i .. (*ti.tiargs).length) { Type t = isType((*ti.tiargs)[j]); assert(t); @@ -760,7 +760,7 @@ private final class CppMangleVisitor : Visitor return false; Dsymbol q = getQualifier(ti); const bool inStd = isStd(q) || isStd(this.getTiNamespace(ti)); - return inStd && ti.tiargs.dim == 1 && isChar((*ti.tiargs)[0]); + return inStd && ti.tiargs.length == 1 && isChar((*ti.tiargs)[0]); } /*** @@ -771,7 +771,7 @@ private final class CppMangleVisitor : Visitor */ bool char_std_char_traits_char(TemplateInstance ti, string st) { - if (ti.tiargs.dim == 2 && + if (ti.tiargs.length == 2 && isChar((*ti.tiargs)[0]) && isChar_traits_char((*ti.tiargs)[1])) { @@ -851,7 +851,7 @@ private final class CppMangleVisitor : Visitor if (ti.name == Id.basic_string) { // ::std::basic_string<char, ::std::char_traits<char>, ::std::allocator<char>> - if (ti.tiargs.dim == 3 && + if (ti.tiargs.length == 3 && isChar((*ti.tiargs)[0]) && isChar_traits_char((*ti.tiargs)[1]) && isAllocator_char((*ti.tiargs)[2])) @@ -933,7 +933,7 @@ private final class CppMangleVisitor : Visitor else if (s.ident == Id.basic_string) { // ::std::basic_string<char, ::std::char_traits<char>, ::std::allocator<char>> - if (ti.tiargs.dim == 3 && + if (ti.tiargs.length == 3 && isChar((*ti.tiargs)[0]) && isChar_traits_char((*ti.tiargs)[1]) && isAllocator_char((*ti.tiargs)[2])) @@ -1224,7 +1224,7 @@ private final class CppMangleVisitor : Visitor case CppOperator.OpAssign: TemplateDeclaration td = ti.tempdecl.isTemplateDeclaration(); assert(td); - assert(ti.tiargs.dim >= 1); + assert(ti.tiargs.length >= 1); TemplateParameter tp = (*td.parameters)[0]; TemplateValueParameter tv = tp.isTemplateValueParameter(); if (!tv || !tv.valType.isString()) @@ -2005,14 +2005,14 @@ extern(C++): this.context.res = (*analyzed_ti.tiargs)[idx]; o.visitObject(this); } - if (analyzed_ti.tiargs.dim > t.tiargs.dim) + if (analyzed_ti.tiargs.length > t.tiargs.length) { // If the resolved AST has more args than the parse one, // we have default arguments auto oparams = (cast(TemplateDeclaration)analyzed_ti.tempdecl).origParameters; - foreach (idx, arg; (*oparams)[t.tiargs.dim .. $]) + foreach (idx, arg; (*oparams)[t.tiargs.length .. $]) { - this.context.res = (*analyzed_ti.tiargs)[idx + t.tiargs.dim]; + this.context.res = (*analyzed_ti.tiargs)[idx + t.tiargs.length]; if (auto ttp = arg.isTemplateTypeParameter()) ttp.defaultType.accept(this); |