Small tweaks to Delete and Select code.

libwccl/ops/actions/delete.cpp

 #include <libwccl/ops/actions/delete.h>
-#include <libwccl/ops/functions/constant.h>
 #include <libpwrutils/foreach.h>
 #include <sstream>
 
@@ -8,13 +7,12 @@ namespace Wccl {
 Bool Delete::execute(const ActionExecContext& context) const
 {
 	Bool changed(false);
-	const boost::shared_ptr<const Position> pos = pos_->apply(context);
-	int abs_pos = context.sentence_context().get_abs_position(*pos);
+	int abs_pos = context.sentence_context().get_abs_position(*pos_->apply(context));
 	if (context.sentence_context().is_inside(abs_pos)) {
 		Corpus2::Token& token = *context.sentence_context().at(abs_pos);
 		std::vector<Corpus2::Lexeme> original(token.lexemes());
 		std::vector<Corpus2::Lexeme> remaining;
-		token.lexemes() = remaining;
+		token.lexemes().clear();
 		foreach (const Corpus2::Lexeme& lexeme, original) {
 			token.add_lexeme(lexeme);
 			if (!condition_->apply(context)->get_value()) {

libwccl/ops/actions/select.cpp

 #include <libwccl/ops/actions/select.h>
-#include <libwccl/ops/functions/constant.h>
+#include <libpwrutils/foreach.h>
 #include <sstream>
 
 namespace Wccl {
@@ -7,13 +7,12 @@ namespace Wccl {
 Bool Select::execute(const ActionExecContext& context) const
 {
 	Bool changed(false);
-	const boost::shared_ptr<const Position> pos = pos_->apply(context);
-	int abs_pos = context.sentence_context().get_abs_position(*pos);
+	int abs_pos = context.sentence_context().get_abs_position(*pos_->apply(context));
 	if (context.sentence_context().is_inside(abs_pos)) {
 		Corpus2::Token& token = *context.sentence_context().at(abs_pos);
 		std::vector<Corpus2::Lexeme> original(token.lexemes());
 		std::vector<Corpus2::Lexeme> remaining;
-		token.lexemes() = remaining;
+		token.lexemes().clear();
 		foreach (const Corpus2::Lexeme& lexeme, original) {
 			token.add_lexeme(lexeme);
 			if (condition_->apply(context)->get_value()) {