From 02c187fd3141203024b6f359ec714c0b804583c0 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 19 Mar 2016 14:40:21 -0400 Subject: Nouns with any uppercase letters are now considered proper --- generator/generator.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'generator/generator.cpp') diff --git a/generator/generator.cpp b/generator/generator.cpp index faef5f7..de369a4 100644 --- a/generator/generator.cpp +++ b/generator/generator.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include "progress.h" struct verb { @@ -525,9 +526,9 @@ int main(int argc, char** argv) { if (nouns.count(word) == 1) { - query = "INSERT INTO nouns (singular, plural) VALUES (?, ?)"; + query = "INSERT INTO nouns (singular, proper, plural) VALUES (?, ?, ?)"; } else { - query = "INSERT INTO nouns (singular) VALUES (?)"; + query = "INSERT INTO nouns (singular, proper) VALUES (?, ?)"; } break; @@ -576,9 +577,14 @@ int main(int argc, char** argv) { case 1: // Noun { + auto sing = nouns[word].singular; + sqlite3_bind_int(ppstmt, 2, (std::any_of(std::begin(sing), std::end(sing), [] (char ch) { + return isupper(ch); + }) ? 1 : 0)); + if (nouns.count(word) == 1) { - sqlite3_bind_text(ppstmt, 2, nouns[word].plural.c_str(), nouns[word].plural.length(), SQLITE_STATIC); + sqlite3_bind_text(ppstmt, 3, nouns[word].plural.c_str(), nouns[word].plural.length(), SQLITE_STATIC); } break; -- cgit 1.4.1