summary refs log tree commit diff stats
path: root/lib/word.cpp
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2017-01-24 21:46:18 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2017-01-24 21:46:18 -0500
commit0ba0fff06fb679f5cabedd52257fc0c38a600279 (patch)
treea7175040f79f98fefa2fe769c6033ddb73c1cda9 /lib/word.cpp
parent6112294292fbe5700b9b652dea54a8e6c6f1c172 (diff)
downloadverbly-0ba0fff06fb679f5cabedd52257fc0c38a600279.tar.gz
verbly-0ba0fff06fb679f5cabedd52257fc0c38a600279.tar.bz2
verbly-0ba0fff06fb679f5cabedd52257fc0c38a600279.zip
Added word::getGroup
Diffstat (limited to 'lib/word.cpp')
-rw-r--r--lib/word.cpp24
1 files changed, 22 insertions, 2 deletions
diff --git a/lib/word.cpp b/lib/word.cpp index 3edf2d2..d13d0bc 100644 --- a/lib/word.cpp +++ b/lib/word.cpp
@@ -93,14 +93,34 @@ namespace verbly {
93 return lemma_; 93 return lemma_;
94 } 94 }
95 95
96 const group& word::getGroup() const
97 {
98 if (!valid_)
99 {
100 throw std::domain_error("Bad access to uninitialized word");
101 }
102
103 if (!hasGroup_)
104 {
105 throw std::domain_error("Word does not have a group");
106 }
107
108 if (!group_)
109 {
110 group_ = db_->groups(group::id == groupId_).first();
111 }
112
113 return group_;
114 }
115
96 std::string word::getBaseForm() const 116 std::string word::getBaseForm() const
97 { 117 {
98 return getLemma().getBaseForm().getText(); 118 return getLemma().getBaseForm().getText();
99 } 119 }
100 120
101 std::list<std::string> word::getInflections(inflection category) const 121 std::vector<std::string> word::getInflections(inflection category) const
102 { 122 {
103 std::list<std::string> result; 123 std::vector<std::string> result;
104 for (const form& infl : getLemma().getInflections(category)) 124 for (const form& infl : getLemma().getInflections(category))
105 { 125 {
106 result.push_back(infl.getText()); 126 result.push_back(infl.getText());