diff --git a/ddmd/dimport.d b/ddmd/dimport.d index 921c32f6e09..64dba8188cd 100644 --- a/ddmd/dimport.d +++ b/ddmd/dimport.d @@ -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()); @@ -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()); @@ -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); diff --git a/ddmd/dmodule.d b/ddmd/dmodule.d index c664293320a..629e9cb84df 100644 --- a/ddmd/dmodule.d +++ b/ddmd/dmodule.d @@ -221,7 +221,7 @@ public: return isAncestorPackageOf(pkg.parent.isPackage()); } - override final void semantic(Scope* sc) + override void semantic(Scope* sc) { } @@ -1007,7 +1007,7 @@ else } // semantic analysis - void semantic() + override void semantic(Scope*) { if (semanticRun != PASSinit) return; @@ -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 @@ -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) diff --git a/ddmd/expression.d b/ddmd/expression.d index 452c4f1c03c..c6628eed9db 100644 --- a/ddmd/expression.d +++ b/ddmd/expression.d @@ -14191,7 +14191,7 @@ extern (C++) Module loadStdMath() if (s.mod) { s.mod.importAll(null); - s.mod.semantic(); + s.mod.semantic(null); } impStdMath = s; } diff --git a/ddmd/module.h b/ddmd/module.h index 38c4f5511e9..d3ef1bdc81c 100644 --- a/ddmd/module.h +++ b/ddmd/module.h @@ -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); diff --git a/driver/codegenerator.d b/driver/codegenerator.d index a75279308e0..2133d4b8f9a 100644 --- a/driver/codegenerator.d +++ b/driver/codegenerator.d @@ -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; diff --git a/driver/main.cpp b/driver/main.cpp index c3e8db99060..0de4d3df0d9 100644 --- a/driver/main.cpp +++ b/driver/main.cpp @@ -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(); @@ -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(); @@ -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();