diff options
Diffstat (limited to 'lib/filter.cpp')
-rw-r--r-- | lib/filter.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/filter.cpp b/lib/filter.cpp index ab46df2..ecff8ac 100644 --- a/lib/filter.cpp +++ b/lib/filter.cpp | |||
@@ -1115,7 +1115,7 @@ namespace verbly { | |||
1115 | case object::form: | 1115 | case object::form: |
1116 | case object::pronunciation: | 1116 | case object::pronunciation: |
1117 | { | 1117 | { |
1118 | return (verbly::notion::word %= *this); | 1118 | return (verbly::notion::words %= *this); |
1119 | } | 1119 | } |
1120 | } | 1120 | } |
1121 | } | 1121 | } |
@@ -1126,7 +1126,7 @@ namespace verbly { | |||
1126 | { | 1126 | { |
1127 | case object::notion: | 1127 | case object::notion: |
1128 | { | 1128 | { |
1129 | return (verbly::word::notion %= *this); | 1129 | return (verbly::word::notions %= *this); |
1130 | } | 1130 | } |
1131 | 1131 | ||
1132 | case object::undefined: | 1132 | case object::undefined: |
@@ -1138,14 +1138,14 @@ namespace verbly { | |||
1138 | case object::frame: | 1138 | case object::frame: |
1139 | case object::part: | 1139 | case object::part: |
1140 | { | 1140 | { |
1141 | return (verbly::word::frame %= *this); | 1141 | return (verbly::word::frames %= *this); |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | case object::lemma: | 1144 | case object::lemma: |
1145 | case object::form: | 1145 | case object::form: |
1146 | case object::pronunciation: | 1146 | case object::pronunciation: |
1147 | { | 1147 | { |
1148 | return (verbly::word::lemma %= *this); | 1148 | return (verbly::word::lemmas %= *this); |
1149 | } | 1149 | } |
1150 | } | 1150 | } |
1151 | 1151 | ||
@@ -1165,12 +1165,12 @@ namespace verbly { | |||
1165 | case object::form: | 1165 | case object::form: |
1166 | case object::pronunciation: | 1166 | case object::pronunciation: |
1167 | { | 1167 | { |
1168 | return (verbly::frame::word %= *this); | 1168 | return (verbly::frame::words %= *this); |
1169 | } | 1169 | } |
1170 | 1170 | ||
1171 | case object::part: | 1171 | case object::part: |
1172 | { | 1172 | { |
1173 | return (verbly::frame::part() %= *this); | 1173 | return (verbly::frame::parts() %= *this); |
1174 | } | 1174 | } |
1175 | } | 1175 | } |
1176 | } | 1176 | } |
@@ -1192,7 +1192,7 @@ namespace verbly { | |||
1192 | case object::form: | 1192 | case object::form: |
1193 | case object::pronunciation: | 1193 | case object::pronunciation: |
1194 | { | 1194 | { |
1195 | return (verbly::part::frame %= *this); | 1195 | return (verbly::part::frames %= *this); |
1196 | } | 1196 | } |
1197 | } | 1197 | } |
1198 | } | 1198 | } |
@@ -1206,7 +1206,7 @@ namespace verbly { | |||
1206 | case object::frame: | 1206 | case object::frame: |
1207 | case object::part: | 1207 | case object::part: |
1208 | { | 1208 | { |
1209 | return verbly::lemma::word %= *this; | 1209 | return verbly::lemma::words %= *this; |
1210 | } | 1210 | } |
1211 | 1211 | ||
1212 | case object::undefined: | 1212 | case object::undefined: |
@@ -1218,7 +1218,7 @@ namespace verbly { | |||
1218 | case object::form: | 1218 | case object::form: |
1219 | case object::pronunciation: | 1219 | case object::pronunciation: |
1220 | { | 1220 | { |
1221 | return (verbly::lemma::form(inflection::base) %= *this); | 1221 | return (verbly::lemma::forms(inflection::base) %= *this); |
1222 | } | 1222 | } |
1223 | } | 1223 | } |
1224 | } | 1224 | } |
@@ -1233,7 +1233,7 @@ namespace verbly { | |||
1233 | case object::part: | 1233 | case object::part: |
1234 | case object::lemma: | 1234 | case object::lemma: |
1235 | { | 1235 | { |
1236 | return verbly::form::lemma %= *this; | 1236 | return verbly::form::lemmas %= *this; |
1237 | } | 1237 | } |
1238 | 1238 | ||
1239 | case object::undefined: | 1239 | case object::undefined: |
@@ -1244,7 +1244,7 @@ namespace verbly { | |||
1244 | 1244 | ||
1245 | case object::pronunciation: | 1245 | case object::pronunciation: |
1246 | { | 1246 | { |
1247 | return (verbly::form::pronunciation %= *this); | 1247 | return (verbly::form::pronunciations %= *this); |
1248 | } | 1248 | } |
1249 | } | 1249 | } |
1250 | } | 1250 | } |
@@ -1260,7 +1260,7 @@ namespace verbly { | |||
1260 | case object::lemma: | 1260 | case object::lemma: |
1261 | case object::form: | 1261 | case object::form: |
1262 | { | 1262 | { |
1263 | return verbly::pronunciation::form %= *this; | 1263 | return verbly::pronunciation::forms %= *this; |
1264 | } | 1264 | } |
1265 | 1265 | ||
1266 | case object::undefined: | 1266 | case object::undefined: |