diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-07 11:26:32 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-07 14:16:33 +0200 |
| commit | d8930b138788258aaad77b8fe821ce44d08a66d1 (patch) | |
| tree | 1093e7665bae9d6d13ece511fec69cbc16d14646 /gcc/d/d-lang.cc | |
| parent | 557a40f599f64e40cc1b20254bf82acc775375f5 (diff) | |
| download | gcc-d8930b138788258aaad77b8fe821ce44d08a66d1.zip gcc-d8930b138788258aaad77b8fe821ce44d08a66d1.tar.gz gcc-d8930b138788258aaad77b8fe821ce44d08a66d1.tar.bz2 | |
d: Merge upstream dmd cef1e7991.
Adds a DString type, a struct that has a compatible layout with D
strings. Many parameters in the Global struct have been switched over
to this type, and users of these params have been adjust to use the
length or ptr field as appropriate.
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd cef1e7991.
* d-lang.cc (d_parse_file): Adjust for new field types.
Diffstat (limited to 'gcc/d/d-lang.cc')
| -rw-r--r-- | gcc/d/d-lang.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gcc/d/d-lang.cc b/gcc/d/d-lang.cc index 54d5799..c4477cd 100644 --- a/gcc/d/d-lang.cc +++ b/gcc/d/d-lang.cc @@ -1027,8 +1027,8 @@ d_parse_file (void) { if (global.params.verbose) { - message ("binary %s", global.params.argv0); - message ("version %s", global.version); + message ("binary %s", global.params.argv0.ptr); + message ("version %s", global.version.ptr); if (global.params.versionids) { @@ -1300,11 +1300,12 @@ d_parse_file (void) OutBuffer buf; json_generate (&buf, &modules); - const char *name = global.params.jsonfilename; + const char *name = global.params.jsonfilename.ptr; if (name && (name[0] != '-' || name[1] != '\0')) { - const char *nameext = FileName::defaultExt (name, global.json_ext); + const char *nameext + = FileName::defaultExt (name, global.json_ext.ptr); File *fjson = File::create (nameext); fjson->setbuffer ((void *) buf.data, buf.offset); fjson->ref = 1; |