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/import.cc | |
| parent | 73c2a45af6afca253159d2cf9c1ecf5747f0217e (diff) | |
Cleaned up argument list handling, related to #116
Diffstat (limited to 'src/import.cc')
| -rw-r--r-- | src/import.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/import.cc b/src/import.cc index 283bbe6..ba42b0a 100644 --- a/src/import.cc +++ b/src/import.cc @@ -65,20 +65,22 @@ public: AbstractNode *ImportModule::evaluate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const { - std::vector<std::string> argnames; - argnames += "file", "layer", "convexity", "origin", "scale"; - std::vector<Expression*> argexpr; + AssignmentList args; + args += Assignment("file", NULL), Assignment("layer", NULL), Assignment("convexity", NULL), Assignment("origin", NULL), Assignment("scale", NULL); + // FIXME: This is broken. Tag as deprecated and fix // Map old argnames to new argnames for compatibility +#if 0 std::vector<std::string> inst_argnames = inst->argnames; for (size_t i=0; i<inst_argnames.size(); i++) { if (inst_argnames[i] == "filename") inst_argnames[i] = "file"; if (inst_argnames[i] == "layername") inst_argnames[i] = "layer"; } +#endif Context c(ctx); c.setDocumentPath(evalctx->documentPath()); - c.setVariables(argnames, argexpr, evalctx); + c.setVariables(args, evalctx); #if 0 && DEBUG c.dump(this, inst); #endif |