diff options
Diffstat (limited to 'lib/form.h')
-rw-r--r-- | lib/form.h | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/lib/form.h b/lib/form.h index aca5b2f..cf64117 100644 --- a/lib/form.h +++ b/lib/form.h | |||
@@ -104,33 +104,9 @@ namespace verbly { | |||
104 | 104 | ||
105 | // Relationships to other objects | 105 | // Relationships to other objects |
106 | 106 | ||
107 | static const field pronunciation; | 107 | static const field lemma; |
108 | |||
109 | class inflection_field { | ||
110 | public: | ||
111 | |||
112 | inflection_field(inflection category) : category_(category) | ||
113 | { | ||
114 | } | ||
115 | |||
116 | const inflection getCategory() const | ||
117 | { | ||
118 | return category_; | ||
119 | } | ||
120 | 108 | ||
121 | operator filter() const; | 109 | static const field pronunciation; |
122 | |||
123 | private: | ||
124 | |||
125 | const inflection category_; | ||
126 | }; | ||
127 | |||
128 | static const inflection_field lemma(inflection category) | ||
129 | { | ||
130 | return inflection_field(category); | ||
131 | } | ||
132 | |||
133 | friend filter operator%=(form::inflection_field check, filter joinCondition); | ||
134 | 110 | ||
135 | private: | 111 | private: |
136 | bool valid_ = false; | 112 | bool valid_ = false; |
@@ -145,9 +121,6 @@ namespace verbly { | |||
145 | mutable bool initializedPronunciations_ = false; | 121 | mutable bool initializedPronunciations_ = false; |
146 | mutable std::vector<class pronunciation> pronunciations_; | 122 | mutable std::vector<class pronunciation> pronunciations_; |
147 | 123 | ||
148 | static const field lemmaJoin; | ||
149 | static const field inflectionCategory; | ||
150 | |||
151 | }; | 124 | }; |
152 | 125 | ||
153 | }; | 126 | }; |