Merge branch 'master' into win32-compat

libcorpus2/CMakeLists.txt

@@ -3,7 +3,7 @@ PROJECT(corpus2)
 
 set(corpus2_ver_major "0")
 set(corpus2_ver_minor "1")
-set(corpus2_ver_patch "1")
+set(corpus2_ver_patch "2")
 
 
 if(NOT LIBCORPUS2_SRC_DATA_DIR)

libcorpus2/tagset.cpp

@@ -98,7 +98,7 @@ std::string Tagset::id_string(const Tag& tag) const
 Tag Tagset::parse_symbol(const std::string& s) const
 {
 	mask_t m = get_pos_mask(s);
-	if (m.none()) {
+	if (m.any()) {
 		return Tag(m);
 	}
 	m = get_attribute_mask(s);

tests/tag_split.cpp

@@ -216,6 +216,18 @@ BOOST_FIXTURE_TEST_CASE( s, F )
 
 }
 
+BOOST_FIXTURE_TEST_CASE( symbols, F )
+{
+	Corpus2::Tag t;
+	t = tagset->parse_symbol("some");
+	BOOST_CHECK_EQUAL(tagset->tag_to_symbol_string(t), "some");
+	t = tagset->parse_symbol("tag");
+	BOOST_CHECK_EQUAL(tagset->tag_to_symbol_string(t), "tag");
+	t = tagset->parse_symbol("C");
+	BOOST_CHECK_EQUAL(tagset->tag_to_symbol_string(t), "C");
+	BOOST_CHECK(tagset->tag_to_symbol_string(t, false) != "C");
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_CASE(bs_split)