aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/dmd/json.d
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2022-12-09 18:59:38 +0100
committerIain Buclaw <ibuclaw@gdcproject.org>2022-12-11 17:17:58 +0100
commit6d799f0aed18be25a5c908499b6411ab6d06b78c (patch)
tree3e6a91048c7fe3e78bae9f75b24eb37c5504681b /gcc/d/dmd/json.d
parentcc7f509d3c0b3ab63891cf7ca2def0fdfb3642c4 (diff)
downloadgcc-6d799f0aed18be25a5c908499b6411ab6d06b78c.zip
gcc-6d799f0aed18be25a5c908499b6411ab6d06b78c.tar.gz
gcc-6d799f0aed18be25a5c908499b6411ab6d06b78c.tar.bz2
d: Merge upstream dmd, druntime c8ae4adb2e, phobos 792c8b7c1.
D front-end changes: - Import dmd v2.101.0. - Deprecate the ability to call `__traits(getAttributes)' on overload sets. - Deprecate non-empty `for' statement increment clause with no effect. - Array literals assigned to `scope' array variables can now be allocated on the stack. D runtime changes: - Import druntime v2.101.0. Phobos changes: - Import phobos v2.101.0. gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd c8ae4adb2e. * typeinfo.cc (check_typeinfo_type): Update for new front-end interface. (TypeInfoVisitor::visit (TypeInfoStructDeclaration *)): Remove warning that toHash() must be declared 'nothrow @safe`. libphobos/ChangeLog: * libdruntime/MERGE: Merge upstream druntime c8ae4adb2e. * src/MERGE: Merge upstream phobos 792c8b7c1.
Diffstat (limited to 'gcc/d/dmd/json.d')
-rw-r--r--gcc/d/dmd/json.d30
1 files changed, 15 insertions, 15 deletions
diff --git a/gcc/d/dmd/json.d b/gcc/d/dmd/json.d
index a22c664..b7719d8 100644
--- a/gcc/d/dmd/json.d
+++ b/gcc/d/dmd/json.d
@@ -386,13 +386,13 @@ public:
extern(D) void property(const char[] name, Parameters* parameters)
{
- if (parameters is null || parameters.dim == 0)
+ if (parameters is null || parameters.length == 0)
return;
propertyStart(name);
arrayStart();
if (parameters)
{
- for (size_t i = 0; i < parameters.dim; i++)
+ for (size_t i = 0; i < parameters.length; i++)
{
Parameter p = (*parameters)[i];
objectStart();
@@ -491,7 +491,7 @@ public:
property("comment", s.comment.toDString);
propertyStart("members");
arrayStart();
- for (size_t i = 0; i < s.members.dim; i++)
+ for (size_t i = 0; i < s.members.length; i++)
{
(*s.members)[i].accept(this);
}
@@ -522,7 +522,7 @@ public:
property("alias", s.aliasId.toString());
bool hasRenamed = false;
bool hasSelective = false;
- for (size_t i = 0; i < s.aliases.dim; i++)
+ for (size_t i = 0; i < s.aliases.length; i++)
{
// avoid empty "renamed" and "selective" sections
if (hasRenamed && hasSelective)
@@ -537,7 +537,7 @@ public:
// import foo : alias1 = target1;
propertyStart("renamed");
objectStart();
- for (size_t i = 0; i < s.aliases.dim; i++)
+ for (size_t i = 0; i < s.aliases.length; i++)
{
const name = s.names[i];
const _alias = s.aliases[i];
@@ -566,7 +566,7 @@ public:
Dsymbols* ds = d.include(null);
if (ds)
{
- for (size_t i = 0; i < ds.dim; i++)
+ for (size_t i = 0; i < ds.length; i++)
{
Dsymbol s = (*ds)[i];
s.accept(this);
@@ -582,7 +582,7 @@ public:
return; // Don't visit the if/else bodies again below
}
Dsymbols* ds = d.decl ? d.decl : d.elsedecl;
- for (size_t i = 0; i < ds.dim; i++)
+ for (size_t i = 0; i < ds.length; i++)
{
Dsymbol s = (*ds)[i];
s.accept(this);
@@ -631,7 +631,7 @@ public:
{
propertyStart("members");
arrayStart();
- for (size_t i = 0; i < d.members.dim; i++)
+ for (size_t i = 0; i < d.members.length; i++)
{
Dsymbol s = (*d.members)[i];
s.accept(this);
@@ -649,11 +649,11 @@ public:
if (tf && tf.ty == Tfunction)
property("parameters", tf.parameterList.parameters);
property("endline", "endchar", d.endloc);
- if (d.foverrides.dim)
+ if (d.foverrides.length)
{
propertyStart("overrides");
arrayStart();
- for (size_t i = 0; i < d.foverrides.dim; i++)
+ for (size_t i = 0; i < d.foverrides.length; i++)
{
FuncDeclaration fd = d.foverrides[i];
item(fd.toPrettyChars().toDString);
@@ -681,7 +681,7 @@ public:
jsonProperties(d);
propertyStart("parameters");
arrayStart();
- for (size_t i = 0; i < d.parameters.dim; i++)
+ for (size_t i = 0; i < d.parameters.length; i++)
{
TemplateParameter s = (*d.parameters)[i];
objectStart();
@@ -732,7 +732,7 @@ public:
}
propertyStart("members");
arrayStart();
- for (size_t i = 0; i < d.members.dim; i++)
+ for (size_t i = 0; i < d.members.length; i++)
{
Dsymbol s = (*d.members)[i];
s.accept(this);
@@ -747,7 +747,7 @@ public:
{
if (d.members)
{
- for (size_t i = 0; i < d.members.dim; i++)
+ for (size_t i = 0; i < d.members.length; i++)
{
Dsymbol s = (*d.members)[i];
s.accept(this);
@@ -762,7 +762,7 @@ public:
{
propertyStart("members");
arrayStart();
- for (size_t i = 0; i < d.members.dim; i++)
+ for (size_t i = 0; i < d.members.length; i++)
{
Dsymbol s = (*d.members)[i];
s.accept(this);
@@ -963,7 +963,7 @@ public:
requiredProperty("name", m.md ? m.md.toString() : null);
requiredProperty("file", m.srcfile.toString());
propertyBool("isRoot", m.isRoot());
- if(m.contentImportedFiles.dim > 0)
+ if(m.contentImportedFiles.length > 0)
{
propertyStart("contentImports");
arrayStart();