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/expressionsem.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/expressionsem.c')
-rw-r--r-- | gcc/d/dmd/expressionsem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/d/dmd/expressionsem.c b/gcc/d/dmd/expressionsem.c index 9112b7b..25f4bd5 100644 --- a/gcc/d/dmd/expressionsem.c +++ b/gcc/d/dmd/expressionsem.c @@ -2678,7 +2678,7 @@ public: MODMatchToBuffer(&thisBuf, e->e1->type->mod, tf->mod); MODMatchToBuffer(&funcBuf, tf->mod, e->e1->type->mod); e->error("%smethod %s is not callable using a %s%s", - funcBuf.peekString(), f->toPrettyChars(), thisBuf.peekString(), e->e1->toChars()); + funcBuf.peekChars(), f->toPrettyChars(), thisBuf.peekChars(), e->e1->toChars()); return setError(); } } @@ -3420,7 +3420,7 @@ public: //printf("tf = %s, args = %s\n", tf->deco, (*exp->arguments)[0]->type->deco); ::error(exp->loc, "%s %s %s is not callable using argument types %s", p, exp->e1->toChars(), parametersTypeToChars(tf->parameterList), - buf.peekString()); + buf.peekChars()); return setError(); } @@ -3493,7 +3493,7 @@ public: //printf("tf = %s, args = %s\n", tf->deco, (*exp->arguments)[0]->type->deco); ::error(exp->loc, "%s %s is not callable using argument types %s", exp->e1->toChars(), parametersTypeToChars(tf->parameterList), - buf.peekString()); + buf.peekChars()); exp->f = NULL; } @@ -8250,7 +8250,7 @@ Expression *semanticX(DotIdExp *exp, Scope *sc) } OutBuffer buf; mangleToBuffer(ds, &buf); - const char *s = buf.extractString(); + const char *s = buf.extractChars(); Expression *e = new StringExp(exp->loc, const_cast<char*>(s), strlen(s)); e = semantic(e, sc); return e; |