From 7ada47adf6d8b204edb2b18aa11991cbfc0c8792 Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Thu, 5 May 2011 13:21:28 +0200
Subject: [PATCH] use wcclfile parsing in wcclrun
---
wccl-apps/wccl-run.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/wccl-apps/wccl-run.cpp b/wccl-apps/wccl-run.cpp
index daec529..4b23e30 100644
--- a/wccl-apps/wccl-run.cpp
+++ b/wccl-apps/wccl-run.cpp
@@ -80,18 +80,22 @@ private:
bool Runner::load_more_operators(const std::string& filename)
{
- boost::shared_ptr<Wccl::FunctionalOperator> retOp;
+ boost::shared_ptr<Wccl::WcclFile> retOp;
try {
std::ifstream is(filename.c_str());
if (!is.good()) {
throw Wccl::FileNotFound(filename, "", __FUNCTION__);
}
- retOp = parser_.parseAnyOperator(is);
+ retOp = parser_.parseWcclFile(is);
if (retOp) {
boost::filesystem::path p(filename);
- op_names_.push_back(p.stem());
- ops_.push_back(retOp);
+ std::string prefix = p.stem() + ":";
+ Wccl::UntypedOpSequence::name_op_v_t pairs = retOp->gen_all_op_pairs();
+ foreach (const Wccl::UntypedOpSequence::name_op_pair_t v, pairs) {
+ op_names_.push_back(prefix + v.first);
+ ops_.push_back(v.second);
+ }
return true;
} else {
std::cerr << "Problem while parsing -- "
--
GitLab