diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-07 19:42:58 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-07 19:44:20 +0200 |
| commit | fced594b313ddfb941913b2f59b10ce3514faaf6 (patch) | |
| tree | 95a78b41b7a8d4523a5ca102d93487e5b90f3471 /gcc/d/dmd/declaration.c | |
| parent | c3a2ba10b272fd9581560604284da2a6283bcde0 (diff) | |
| download | gcc-fced594b313ddfb941913b2f59b10ce3514faaf6.zip gcc-fced594b313ddfb941913b2f59b10ce3514faaf6.tar.gz gcc-fced594b313ddfb941913b2f59b10ce3514faaf6.tar.bz2 | |
d: Merge upstream dmd 108ca1bcd.
Renames OutBuffer::peekString to OutBuffer::peekChars, and
OutBuffer::extractString to OutBuffer::extractChars. All callers have
been updated as appropriate.
Reviewed-on: https://github.com/dlang/dmd/pull/11247
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd 108ca1bcd.
* d-diagnostic.cc (expand_d_format): Adjust to use extractChars().
* d-frontend.cc (Loc::toChars): Likewise.
* d-lang.cc (deps_write): Likewise.
(d_parse_file): Likewise.
* decl.cc (d_mangle_decl): Likewise.
* intrinsics.cc (maybe_set_intrinsic): Likewise.
Diffstat (limited to 'gcc/d/dmd/declaration.c')
| -rw-r--r-- | gcc/d/dmd/declaration.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/d/dmd/declaration.c b/gcc/d/dmd/declaration.c index 04f7a34..aa48195 100644 --- a/gcc/d/dmd/declaration.c +++ b/gcc/d/dmd/declaration.c @@ -1119,7 +1119,7 @@ Lnomatch: OutBuffer buf; buf.printf("__%s_field_%llu", ident->toChars(), (ulonglong)i); - const char *name = buf.extractString(); + const char *name = buf.extractChars(); Identifier *id = Identifier::idPool(name); Initializer *ti; @@ -1190,7 +1190,7 @@ Lnomatch: { OutBuffer buf; stcToBuffer(&buf, stc); - error("cannot be %s", buf.peekString()); + error("cannot be %s", buf.peekChars()); } storage_class &= ~stc; // strip off } @@ -1202,7 +1202,7 @@ Lnomatch: { OutBuffer buf; stcToBuffer(&buf, stc); - error("cannot be 'scope' and '%s'", buf.peekString()); + error("cannot be 'scope' and '%s'", buf.peekChars()); } else if (isMember()) { @@ -2246,7 +2246,7 @@ const char *TypeInfoDeclaration::toChars() buf.writestring("typeid("); buf.writestring(tinfo->toChars()); buf.writeByte(')'); - return buf.extractString(); + return buf.extractChars(); } /***************************** TypeInfoConstDeclaration **********************/ |