Skip to content

Early merge front-end fixes for Module.semantic. #1676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohanEngelen merged 1 commit into from
Aug 13, 2016
Merged

Early merge front-end fixes for Module.semantic. #1676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ddmd/dimport.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public:
scopesym.addAccessiblePackage(mod, protection); // d
}

mod.semantic();
mod.semantic(null);
if (mod.needmoduleinfo)
{
//printf("module4 %s because of %s\n", sc.module.toChars(), mod.toChars());
Expand Down Expand Up @@ -388,7 +388,7 @@ public:
//printf("Import::semantic2('%s')\n", toChars());
if (mod)
{
mod.semantic2();
mod.semantic2(null);
if (mod.needmoduleinfo)
{
//printf("module5 %s because of %s\n", sc.module.toChars(), mod.toChars());
Expand Down Expand Up @@ -454,7 +454,7 @@ public:
{
load(null);
mod.importAll(null);
mod.semantic();
mod.semantic(null);
}
// Forward it to the package/module
return pkg.search(loc, ident, flags);
Expand Down
8 changes: 4 additions & 4 deletions ddmd/dmodule.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public:
return isAncestorPackageOf(pkg.parent.isPackage());
}

override final void semantic(Scope* sc)
override void semantic(Scope* sc)
{
}

Expand Down Expand Up @@ -1007,7 +1007,7 @@ else
}

// semantic analysis
void semantic()
override void semantic(Scope*)
{
if (semanticRun != PASSinit)
return;
Expand Down Expand Up @@ -1044,7 +1044,7 @@ else
}

// pass 2 semantic analysis
void semantic2()
override void semantic2(Scope*)
{
//printf("Module::semantic2('%s'): parent = %p\n", toChars(), parent);
if (semanticRun != PASSsemanticdone) // semantic() not completed yet - could be recursive call
Expand Down Expand Up @@ -1072,7 +1072,7 @@ else
}

// pass 3 semantic analysis
void semantic3()
override void semantic3(Scope*)
{
//printf("Module::semantic3('%s'): parent = %p\n", toChars(), parent);
if (semanticRun != PASSsemantic2done)
Expand Down
2 changes: 1 addition & 1 deletion ddmd/expression.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14191,7 +14191,7 @@ extern (C++) Module loadStdMath()
if (s.mod)
{
s.mod.importAll(null);
s.mod.semantic();
s.mod.semantic(null);
}
impStdMath = s;
}
Expand Down
6 changes: 3 additions & 3 deletions ddmd/module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ class Module : public Package
Module *parse(); // syntactic parse
#endif
void importAll(Scope *sc);
void semantic(); // semantic analysis
void semantic2(); // pass 2 semantic analysis
void semantic3(); // pass 3 semantic analysis
void semantic(Scope *); // semantic analysis
void semantic2(Scope *); // pass 2 semantic analysis
void semantic3(Scope *); // pass 3 semantic analysis
int needModuleInfo();
Dsymbol *search(Loc loc, Identifier *ident, int flags = SearchLocalsOnly);
Dsymbol *symtabInsert(Dsymbol *s);
Expand Down
6 changes: 3 additions & 3 deletions driver/codegenerator.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ extern (C++) void genCmain(Scope *sc) {
global.params.verbose = false;
m.importedFrom = m;
m.importAll(null);
m.semantic();
m.semantic2();
m.semantic3();
m.semantic(null);
m.semantic2(null);
m.semantic3(null);
global.params.verbose = v;

g_entrypointModule = m;
Expand Down
6 changes: 3 additions & 3 deletions driver/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,7 @@ int cppmain(int argc, char **argv) {
if (global.params.verbose) {
fprintf(global.stdmsg, "semantic %s\n", modules[i]->toChars());
}
modules[i]->semantic();
modules[i]->semantic(nullptr);
}
if (global.errors) {
fatal();
Expand All @@ -1388,7 +1388,7 @@ int cppmain(int argc, char **argv) {
if (global.params.verbose) {
fprintf(global.stdmsg, "semantic2 %s\n", modules[i]->toChars());
}
modules[i]->semantic2();
modules[i]->semantic2(nullptr);
}
if (global.errors) {
fatal();
Expand All @@ -1399,7 +1399,7 @@ int cppmain(int argc, char **argv) {
if (global.params.verbose) {
fprintf(global.stdmsg, "semantic3 %s\n", modules[i]->toChars());
}
modules[i]->semantic3();
modules[i]->semantic3(nullptr);
}
if (global.errors) {
fatal();
Expand Down