From fd3ab7bfa89a4072a429d2159007e4d55896a78c Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 19 Mar 2016 15:29:32 -0400 Subject: An update to verbly makes the "genus" exception unnecessary --- nancy.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/nancy.cpp b/nancy.cpp index 00c68c5..6a89061 100644 --- a/nancy.cpp +++ b/nancy.cpp @@ -91,18 +91,8 @@ int main(int argc, char** argv) // Nouns while ((i = form.find("{noun}")) != std::string::npos) { - std::string nf; - for (;;) - { - verbly::noun n = database.nouns().is_not_proper(true).random(true).limit(1).run().front(); - if (n.singular_form().find("genus") == std::string::npos) - { - nf = n.singular_form(); - break; - } - } - - form.replace(i, 6, capitalize(nf)); + verbly::noun n = database.nouns().is_not_proper(true).random(true).limit(1).run().front(); + form.replace(i, 6, capitalize(n.singular_form())); } if (form.size() > 140) -- cgit 1.4.1