aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/dmd/json.c
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2020-06-04 22:36:26 +0200
committerIain Buclaw <ibuclaw@gdcproject.org>2020-06-04 23:27:12 +0200
commit2cbc99d18dc411ac3fdef94e22ce86859806e63c (patch)
tree82939940413c5e726889ccd97fa2afd33e0b06be /gcc/d/dmd/json.c
parent4e05c918d28e3fa66f5baaf556f6886447c68c9a (diff)
downloadgcc-2cbc99d18dc411ac3fdef94e22ce86859806e63c.zip
gcc-2cbc99d18dc411ac3fdef94e22ce86859806e63c.tar.gz
gcc-2cbc99d18dc411ac3fdef94e22ce86859806e63c.tar.bz2
d: Merge upstream dmd 48d704f08
Updates the Array interface in dmd/root/array.h to use a DArray<TYPE> internally. Splits out BitArray into a separate header. Reviewed-on: https://github.com/dlang/dmd/pull/11219 gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd 48d704f08. * d-attribs.cc (build_attributes): Use new field name. * d-builtins.cc (build_frontend_type): Likewise. (maybe_set_builtin_1): Likewise. (d_maybe_set_builtin): Likewise. * d-codegen.cc (build_interface_binfo): Likewise. (identity_compare_p): Likewise. (lower_struct_comparison): Likewise. (build_struct_comparison): Likewise. (d_build_call): Likewise. (build_frame_type): Likewise. (build_closure): Likewise. * d-compiler.cc (Compiler::paintAsType): Likewise. (Compiler::loadModule): Likewise. * d-incpath.cc (add_globalpaths): Likewise. (add_filepaths): Likewise. (add_import_paths): Likewise. * d-lang.cc (deps_write): Likewise. (d_parse_file): Likewise. * decl.cc (gcc_attribute_p): Likewise. (base_vtable_offset): Likewise. (get_vtable_decl): Likewise. (build_class_instance): Likewise. * expr.cc (class ExprVisitor): Likewise. * modules.cc (layout_moduleinfo_fields): Likewise. (layout_moduleinfo): Likewise. (build_module_tree): Likewise. * toir.cc (class IRVisitor): Likewise. * typeinfo.cc (class TypeInfoVisitor): Likewise. (layout_classinfo_interfaces): Likewise. * types.cc (layout_aggregate_members): Likewise. (layout_aggregate_type): Likewise.
Diffstat (limited to 'gcc/d/dmd/json.c')
-rw-r--r--gcc/d/dmd/json.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/gcc/d/dmd/json.c b/gcc/d/dmd/json.c
index 9b8b6a6..ba0cc6f 100644
--- a/gcc/d/dmd/json.c
+++ b/gcc/d/dmd/json.c
@@ -394,7 +394,7 @@ public:
void property(const char *name, Parameters *parameters)
{
- if (parameters == NULL || parameters->dim == 0)
+ if (parameters == NULL || parameters->length == 0)
return;
propertyStart(name);
@@ -402,7 +402,7 @@ public:
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();
@@ -512,7 +512,7 @@ public:
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);
}
@@ -530,9 +530,9 @@ public:
propertyStart("name");
stringStart();
- if (s->packages && s->packages->dim)
+ if (s->packages && s->packages->length)
{
- for (size_t i = 0; i < s->packages->dim; i++)
+ for (size_t i = 0; i < s->packages->length; i++)
{
Identifier *pid = (*s->packages)[i];
stringPart(pid->toChars());
@@ -553,7 +553,7 @@ public:
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)
@@ -569,7 +569,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++)
{
Identifier *name = s->names[i];
Identifier *alias = s->aliases[i];
@@ -583,7 +583,7 @@ public:
// import foo : target1;
propertyStart("selective");
arrayStart();
- for (size_t i = 0; i < s->names.dim; i++)
+ for (size_t i = 0; i < s->names.length; i++)
{
Identifier *name = s->names[i];
if (!s->aliases[i]) item(name->toChars());
@@ -600,7 +600,7 @@ public:
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);
@@ -660,7 +660,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);
@@ -683,11 +683,11 @@ public:
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());
@@ -721,7 +721,7 @@ public:
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();
@@ -786,7 +786,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);
@@ -802,7 +802,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);
@@ -821,7 +821,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);
@@ -879,7 +879,7 @@ void json_generate(OutBuffer *buf, Modules *modules)
ToJsonVisitor json(buf);
json.arrayStart();
- for (size_t i = 0; i < modules->dim; i++)
+ for (size_t i = 0; i < modules->length; i++)
{
Module *m = (*modules)[i];
if (global.params.verbose)