diff options
author | Marius Kintel <marius@kintel.net> | 2013-04-18 22:34:14 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2013-04-18 22:34:14 (GMT) |
commit | 58bd9c9e3f4454d055bf51d63463a9965a9dcbd7 (patch) | |
tree | 732cd423858685365a4115d44a52f85ae90866a1 /src/module.h | |
parent | 73c2a45af6afca253159d2cf9c1ecf5747f0217e (diff) |
Cleaned up argument list handling, related to #116
Diffstat (limited to 'src/module.h')
-rw-r--r-- | src/module.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/module.h b/src/module.h index 17f0c59..ace3c1b 100644 --- a/src/module.h +++ b/src/module.h @@ -6,6 +6,7 @@ #include <list> #include <boost/unordered_map.hpp> #include "value.h" +#include "typedefs.h" class ModuleInstantiation { @@ -27,8 +28,7 @@ public: bool isHighlight() const { return this->tag_highlight; } bool isRoot() const { return this->tag_root; } - std::vector<std::string> argnames; - std::vector<class Expression*> argexpr; + AssignmentList arguments; std::vector<ModuleInstantiation*> children; bool tag_root; @@ -81,8 +81,8 @@ public: bool handleDependencies(); std::list<std::string> assignments_var; - typedef boost::unordered_map<std::string, Expression*> AssignmentContainer; - AssignmentContainer assignments; + typedef boost::unordered_map<std::string, Expression*> AssignmentMap; + AssignmentMap assignments; typedef boost::unordered_map<std::string, class AbstractFunction*> FunctionContainer; FunctionContainer functions; @@ -91,8 +91,7 @@ public: std::vector<ModuleInstantiation*> children; - std::vector<std::string> argnames; - std::vector<Expression*> argexpr; + std::vector<Assignment> definition_arguments; protected: |