diff options
| author | Marius Kintel <marius@kintel.net> | 2013-04-24 13:17:25 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-04-26 21:45:03 (GMT) |
| commit | 9b740b558dd627412e01a3521d5372d95e294af2 (patch) | |
| tree | f34ebfa719303629e27d5fe84c177b5ac38adfbe /src/module.h | |
| parent | 9a297ecee57549a4eb3919bde4f7b41a548724de (diff) | |
Further refactoring of scope/context mechanisms. Mostly related to the new FileContext class. Not quite there yet, but almost
Diffstat (limited to 'src/module.h')
| -rw-r--r-- | src/module.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/module.h b/src/module.h index 39d4bba..b7ee23d 100644 --- a/src/module.h +++ b/src/module.h @@ -65,7 +65,7 @@ public: Module() { } virtual ~Module(); - virtual AbstractNode *instantiate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const; + virtual AbstractNode *instantiate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx = NULL) const; virtual std::string dump(const std::string &indent, const std::string &name) const; void addChild(ModuleInstantiation *ch); @@ -75,6 +75,8 @@ public: LocalScope scope; }; +// FIXME: A FileModule doesn't have definition arguments, so we shouldn't really +// inherit from a Module class FileModule : public Module { public: @@ -85,6 +87,7 @@ public: const std::string &modulePath() const { return this->path; } void registerInclude(const std::string &filename); bool handleDependencies(); + virtual AbstractNode *instantiate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx = NULL) const; typedef boost::unordered_map<std::string, class FileModule*> ModuleContainer; ModuleContainer usedlibs; |