mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-27 21:51:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ImportC: allow imports from multiple C files (#14457)

Browse source
This commit is contained in:
Walter Bright 2022-09-20 00:18:41 -07:00 • committed by GitHub
parent 8d76134534
commit 194182a9c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/src/dmd/dsymbol.d
View file

@ -1544,6 +1544,12 @@ public:
if (flags & IgnoreAmbiguous) // if return NULL on ambiguity if (flags & IgnoreAmbiguous) // if return NULL on ambiguity
return null; return null;
/* If two imports from C import files, pick first one, as C has global name space
*/
if (s.isCsymbol() && s2.isCsymbol())
continue;
if (!(flags & IgnoreErrors)) if (!(flags & IgnoreErrors))
ScopeDsymbol.multiplyDefined(loc, s, s2); ScopeDsymbol.multiplyDefined(loc, s, s2);
break; break;

4
compiler/test/compilable/cimports2.i Normal file
View file

@ -0,0 +1,4 @@
__import imports.cimports2a;
__import imports.cimports2b;
int *p = &xx;

1
compiler/test/compilable/imports/cimports2a.i Normal file
View file

@ -0,0 +1 @@
extern int xx;

1
compiler/test/compilable/imports/cimports2b.i Normal file
View file

@ -0,0 +1 @@
extern int xx;