From bae07fb4e1486be91418445fdb9822542c52ce42 Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Fri, 25 Feb 2011 10:46:11 +0100
Subject: [PATCH] sync with parse_*_tag changes in corpus2
---
tests/getsymbols.cpp | 10 +++++-----
tests/getsymbolsinrange.cpp | 10 +++++-----
tests/values.cpp | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/getsymbols.cpp b/tests/getsymbols.cpp
index ff68c3b..effd28d 100644
--- a/tests/getsymbols.cpp
+++ b/tests/getsymbols.cpp
@@ -27,17 +27,17 @@ struct SymbolsFix
Corpus2::Token* the_token = new Corpus2::Token(
"One",
PwrNlp::Whitespace::ManySpaces);
- Corpus2::Lexeme l1("aaa", tagset.parse_simple_tag("subst:sg:nom:m1", false));
- Corpus2::Lexeme l2("aaa", tagset.parse_simple_tag("subst:sg:nom:m2", false));
+ Corpus2::Lexeme l1("aaa", tagset.parse_simple_tag("subst:sg:nom:m1"));
+ Corpus2::Lexeme l2("aaa", tagset.parse_simple_tag("subst:sg:nom:m2"));
the_token->add_lexeme(l1);
the_token->add_lexeme(l2);
s->append(the_token);
Corpus2::Token* another_token = new Corpus2::Token(
"Two",
PwrNlp::Whitespace::ManySpaces);
- Corpus2::Lexeme l3("aaa", tagset.parse_simple_tag("subst:pl:dat:f", false));
- Corpus2::Lexeme l4("aaa", tagset.parse_simple_tag("prep:nom:wok", false));
- Corpus2::Lexeme l5("aaa", tagset.parse_simple_tag("adja", false));
+ Corpus2::Lexeme l3("aaa", tagset.parse_simple_tag("subst:pl:dat:f"));
+ Corpus2::Lexeme l4("aaa", tagset.parse_simple_tag("prep:nom:wok"));
+ Corpus2::Lexeme l5("aaa", tagset.parse_simple_tag("adja"));
another_token->add_lexeme(l3);
another_token->add_lexeme(l4);
another_token->add_lexeme(l5);
diff --git a/tests/getsymbolsinrange.cpp b/tests/getsymbolsinrange.cpp
index 51374a4..521ba4c 100644
--- a/tests/getsymbolsinrange.cpp
+++ b/tests/getsymbolsinrange.cpp
@@ -33,17 +33,17 @@ struct SymbolsInRangeFix
Corpus2::Token* the_token = new Corpus2::Token(
"One",
PwrNlp::Whitespace::ManySpaces);
- Corpus2::Lexeme l1("aaa", tagset.parse_simple_tag("subst:sg:nom:m1", false));
- Corpus2::Lexeme l2("aaa", tagset.parse_simple_tag("subst:sg:nom:m2", false));
+ Corpus2::Lexeme l1("aaa", tagset.parse_simple_tag("subst:sg:nom:m1"));
+ Corpus2::Lexeme l2("aaa", tagset.parse_simple_tag("subst:sg:nom:m2"));
the_token->add_lexeme(l1);
the_token->add_lexeme(l2);
s->append(the_token);
Corpus2::Token* another_token = new Corpus2::Token(
"Two",
PwrNlp::Whitespace::ManySpaces);
- Corpus2::Lexeme l3("aaa", tagset.parse_simple_tag("subst:pl:dat:f", false));
- Corpus2::Lexeme l4("aaa", tagset.parse_simple_tag("prep:nom:wok", false));
- Corpus2::Lexeme l5("aaa", tagset.parse_simple_tag("adja", false));
+ Corpus2::Lexeme l3("aaa", tagset.parse_simple_tag("subst:pl:dat:f"));
+ Corpus2::Lexeme l4("aaa", tagset.parse_simple_tag("prep:nom:wok"));
+ Corpus2::Lexeme l5("aaa", tagset.parse_simple_tag("adja"));
another_token->add_lexeme(l3);
another_token->add_lexeme(l4);
another_token->add_lexeme(l5);
diff --git a/tests/values.cpp b/tests/values.cpp
index f15247b..d87c1b1 100644
--- a/tests/values.cpp
+++ b/tests/values.cpp
@@ -68,8 +68,8 @@ BOOST_AUTO_TEST_CASE(tset_ops)
{
TSet s1, s2;
const Corpus2::Tagset& tagset = Corpus2::get_named_tagset("kipi");
- Corpus2::Tag subst_tag = tagset.parse_tag("subst:sg:nom:f", false)[0];
- Corpus2::Tag adj_tag = tagset.parse_tag("adj:pl:acc:m3:pos", false)[0];
+ Corpus2::Tag subst_tag = tagset.parse_simple_tag("subst:sg:nom:f");
+ Corpus2::Tag adj_tag = tagset.parse_simple_tag("adj:pl:acc:m3:pos");
BOOST_CHECK(s1.equals(s2));
BOOST_CHECK(s1.is_subset_of(s2));
--
GitLab