D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-04-04 19:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged 2.056

Browse Source
This commit is contained in:
Alexey Prokhin
2011-12-02 21:50:52 +04:00
parent 7d74a801bb 4ab6869c50
commit 014d6bdd4d
65 changed files with 6538 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dmd2/module.c
View File

@@ -475,7 +475,7 @@ Module *Module::load(Loc loc, Identifiers *packages, Identifier *ident)
{
for (size_t i = 0; i < global.path->dim; i++)
{
char *p = global.path->tdata()[i];
char *p = (*global.path)[i];
char *n = FileName::combine(p, sdi);
if (FileName::exists(n))
{ result = n;
@@ -795,6 +795,11 @@ void Module::parse()
#endif
p.nextToken();
members = p.parseModule();
::free(srcfile->buffer);
srcfile->buffer = NULL;
srcfile->len = 0;
md = p.md;
numlines = p.loc.linnum;
@@ -855,7 +860,7 @@ void Module::importAll(Scope *prevsc)
// Add import of "object" if this module isn't "object"
if (ident != Id::object)
{
if (members->dim == 0 || members->tdata()[0]->ident != Id::object)
if (members->dim == 0 || ((*members)[0])->ident != Id::object)
{
Import *im = new Import(0, NULL, Id::object, NULL, 0);
members->shift(im);