Updated verbly (datafile versioning)

3 files changed, 18 insertions, 30 deletions

@@ -226,8 +226,7 @@ verbly::token sentence::generateStandardNounPhrase(
   bool definite) const
 {
   verbly::token utter;
-  verbly::word sounder = noun;
-  verbly::word descript;
+  bool indefiniteArticle = false;
 
   /*if (std::bernoulli_distribution(1.0/8.0)(rng_))
   {
@@ -252,20 +251,10 @@ verbly::token sentence::generateStandardNounPhrase(
     {
       utter << "your";
     } else if (!plural) {
-      if (sounder.getBaseForm().startsWithVowelSound())
-      {
-        utter << "an";
-      } else {
-        utter << "a";
-      }
+      indefiniteArticle = true;
     }
   }
 
-  if (descript.isValid())
-  {
-    utter << descript;
-  }
-
   if (plural && noun.hasInflection(verbly::inflection::plural))
   {
     utter << verbly::token(noun, verbly::inflection::plural);
@@ -273,7 +262,12 @@ verbly::token sentence::generateStandardNounPhrase(
     utter << noun;
   }
 
-  return utter;
+  if (indefiniteArticle)
+  {
+    return verbly::token::indefiniteArticle(utter);
+  } else {
+    return utter;
+  }
 }
 
 verbly::token sentence::generateClause(
@@ -446,20 +440,15 @@ verbly::token sentence::generateClause(
           utter << generateClause(sentence);
         } else if (part.nounHasSynrestr("quotation"))
         {
-          verbly::token sentence(std::set<std::string>({"participle_phrase"}));
-          while (!sentence.isComplete())
-          {
-            visit(sentence);
-          }
-
-          utter << ("\"" + sentence.compile() + "\"");
+          utter << verbly::token::quote("\"", "\"",
+            verbly::token(std::set<std::string>({"participle_phrase"})));
         } else {
           if (part.nounHasSynrestr("genitive"))
           {
             verbly::word noun = generateStandardNoun("Passive", {"animate"});
             verbly::token owner = generateStandardNounPhrase(noun, "Passive", false, true);
-            std::string ownerStr = owner.compile() + "'s";
-            utter << ownerStr;
+
+            utter << verbly::token::punctuation("'s", owner);
           }
 
           verbly::word noun = generateStandardNoun(part.getNounRole(), part.getNounSelrestrs());
@@ -665,4 +654,3 @@ void sentence::visit(verbly::token& it) const
     }
   }
 }
-
@@ -18,6 +18,12 @@ int main(int argc, char** argv)
   std::string configfile(argv[1]);
   YAML::Node config = YAML::LoadFile(configfile);
 
+  std::random_device randomDevice;
+  std::mt19937 rng{randomDevice()};
+
+  verbly::database database(config["verbly_datafile"].as<std::string>());
+  sentence generator(database, rng);
+
   twitter::auth auth;
   auth.setConsumerKey(config["consumer_key"].as<std::string>());
   auth.setConsumerSecret(config["consumer_secret"].as<std::string>());
@@ -26,12 +32,6 @@ int main(int argc, char** argv)
 
   twitter::client client(auth);
 
-  std::random_device randomDevice;
-  std::mt19937 rng{randomDevice()};
-
-  verbly::database database(config["verbly_datafile"].as<std::string>());
-  sentence generator(database, rng);
-
   for (;;)
   {
     verbly::word adjective = database.words(
-Subproject 59eab842de02b2b2ba8bf53e2214b558457e635
+Subproject 350bfdb5ea9b4f7e50746c50a46d8032cbc5a10