From c797a152278e649364fcaa57794134fca53b89b0 Mon Sep 17 00:00:00 2001 From: k-hara Date: Wed, 21 May 2014 22:26:06 +0900 Subject: [PATCH] Remove workaround for issue 11939 --- src/statement.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/statement.c b/src/statement.c index 3f8be2b96a4b..79bf201f1072 100644 --- a/src/statement.c +++ b/src/statement.c @@ -4946,23 +4946,20 @@ Statement *ImportStatement::semantic(Scope *sc) for (size_t i = 0; i < imports->dim; i++) { Import *s = (*imports)[i]->isImport(); - - if (!s->aliasdecls.dim) + assert(!s->aliasdecls.dim); + for (size_t j = 0; j < s->names.dim; j++) { - for (size_t j = 0; j < s->names.dim; j++) - { - Identifier *name = s->names[j]; - Identifier *alias = s->aliases[j]; + Identifier *name = s->names[j]; + Identifier *alias = s->aliases[j]; - if (!alias) - alias = name; + if (!alias) + alias = name; - TypeIdentifier *tname = new TypeIdentifier(s->loc, name); - AliasDeclaration *ad = new AliasDeclaration(s->loc, alias, tname); - ad->import = s; + TypeIdentifier *tname = new TypeIdentifier(s->loc, name); + AliasDeclaration *ad = new AliasDeclaration(s->loc, alias, tname); + ad->import = s; - s->aliasdecls.push(ad); - } + s->aliasdecls.push(ad); } s->semantic(sc);