Merge branch 'master' of nlp.pwr.wroc.pl:wccl

libwccl/CMakeLists.txt

@@ -18,6 +18,7 @@ SET(libwccl_STAT_SRC
 	values/position.cpp
 	values/positionref.cpp
 	values/strset.cpp
+	values/tset.cpp
 	values/value.cpp
 	variables.cpp
 )

libwccl/values/tset.cpp

+#include <libwccl/values/tset.h>
+
+namespace Wccl {
+
+const char* TSet::type_name = "TSet";
+
+} /* end ns Wccl */

libwccl/values/tset.h

+#ifndef LIBWCCL_VALUES_TSET_H
+#define LIBWCCL_VALUES_TSET_H
+
+#include <libwccl/values/value.h>
+#include <libcorpus2/tag.h>
+
+namespace Wccl {
+
+class TSet : public Value
+{
+public:
+	WCCL_VALUE_PREAMBLE;
+
+	TSet()
+		: tag_()
+	{
+	}
+
+	explicit TSet(Corpus2::Tag tag)
+		: tag_(tag)
+	{
+	}
+
+	const Corpus2::Tag& get_tag() const {
+		return tag_;
+	}
+
+	void set_tag(const Corpus2::Tag& tag) {
+		tag_ = tag;
+	}
+
+	Corpus2::Tag& tag_ref() {
+		return tag_;
+	}
+
+private:
+	Corpus2::Tag tag_;
+};
+
+
+} /* end ns Wccl */
+
+#endif // LIBWCCL_VALUES_TSET_H

libwccl/variables.h

@@ -6,6 +6,7 @@
 #include <libwccl/values/position.h>
 #include <libwccl/values/positionref.h>
 #include <libwccl/values/strset.h>
+#include <libwccl/values/tset.h>
 #include <iostream>
 #include <map>
 #include <string>
@@ -86,12 +87,13 @@ class Variables : detail::Vmap<Value>
 	, detail::Vmap<Position>
 	, detail::Vmap<PositionRef>
 	, detail::Vmap<StrSet>
+	, detail::Vmap<TSet>
 {
 public:
 	/// Valid value types, should match the inheritance.
 	/// the type Value must be first, order of other items is not important
 	typedef boost::mpl::list<Value,
-		Bool, Position, PositionRef, StrSet> types;
+		Bool, Position, PositionRef, StrSet, TSet> types;
 
 	/// Constructor, creates an empty instance.
 	Variables();