diff options
Diffstat (limited to 'lib/noun_query.h')
-rw-r--r-- | lib/noun_query.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/noun_query.h b/lib/noun_query.h index 44a1c70..19fbc60 100644 --- a/lib/noun_query.h +++ b/lib/noun_query.h | |||
@@ -12,6 +12,10 @@ namespace verbly { | |||
12 | noun_query& except(const noun& _word); | 12 | noun_query& except(const noun& _word); |
13 | noun_query& rhymes_with(const word& _word); | 13 | noun_query& rhymes_with(const word& _word); |
14 | noun_query& has_pronunciation(); | 14 | noun_query& has_pronunciation(); |
15 | noun_query& has_rhyming_noun(); | ||
16 | noun_query& has_rhyming_adjective(); | ||
17 | noun_query& has_rhyming_adverb(); | ||
18 | noun_query& has_rhyming_verb(); | ||
15 | 19 | ||
16 | noun_query& with_singular_form(std::string _arg); | 20 | noun_query& with_singular_form(std::string _arg); |
17 | noun_query& with_prefix(filter<std::string> _f); | 21 | noun_query& with_prefix(filter<std::string> _f); |
@@ -74,6 +78,9 @@ namespace verbly { | |||
74 | noun_query& is_attribute(); | 78 | noun_query& is_attribute(); |
75 | noun_query& attribute_of(filter<adjective> _f); | 79 | noun_query& attribute_of(filter<adjective> _f); |
76 | 80 | ||
81 | noun_query& at_least_n_images(int _arg); | ||
82 | noun_query& with_wnid(int _arg); | ||
83 | |||
77 | /* noun_query& derived_from(const word& _w); | 84 | /* noun_query& derived_from(const word& _w); |
78 | noun_query& not_derived_from(const word& _w);*/ | 85 | noun_query& not_derived_from(const word& _w);*/ |
79 | 86 | ||
@@ -85,9 +92,13 @@ namespace verbly { | |||
85 | const data& _data; | 92 | const data& _data; |
86 | int _limit = unlimited; | 93 | int _limit = unlimited; |
87 | bool _random = false; | 94 | bool _random = false; |
88 | std::list<std::string> _rhymes; | 95 | std::list<rhyme> _rhymes; |
89 | std::list<noun> _except; | 96 | std::list<noun> _except; |
90 | bool _has_prn = false; | 97 | bool _has_prn = false; |
98 | bool _has_rhyming_noun = false; | ||
99 | bool _has_rhyming_adjective = false; | ||
100 | bool _has_rhyming_adverb = false; | ||
101 | bool _has_rhyming_verb = false; | ||
91 | 102 | ||
92 | std::list<std::string> _with_singular_form; | 103 | std::list<std::string> _with_singular_form; |
93 | filter<std::string> _with_prefix; | 104 | filter<std::string> _with_prefix; |
@@ -150,6 +161,9 @@ namespace verbly { | |||
150 | bool _is_attribute = false; | 161 | bool _is_attribute = false; |
151 | filter<adjective> _attribute_of; | 162 | filter<adjective> _attribute_of; |
152 | 163 | ||
164 | int _at_least_n_images = unlimited; | ||
165 | std::set<int> _with_wnid; | ||
166 | |||
153 | /* std::list<adjective> _derived_from_adjective; | 167 | /* std::list<adjective> _derived_from_adjective; |
154 | std::list<adjective> _not_derived_from_adjective; | 168 | std::list<adjective> _not_derived_from_adjective; |
155 | std::list<adverb> _derived_from_adverb; | 169 | std::list<adverb> _derived_from_adverb; |