From c4743dd4dd15681b1ff9d2be64c8307d0dce53b9 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Mon, 23 Jan 2017 12:03:51 -0500
Subject: Added form::startsWithVowelSound convenience method

---
 lib/form.h | 84 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

(limited to 'lib/form.h')

diff --git a/lib/form.h b/lib/form.h
index c6a1353..c9c2a9e 100644
--- a/lib/form.h
+++ b/lib/form.h
@@ -6,144 +6,148 @@
 #include <string>
 #include <stdexcept>
 #include "field.h"
+#include "pronunciation.h"
 #include "filter.h"
 
 struct sqlite3_stmt;
 
 namespace verbly {
-  
-  class pronunciation;
+
   class database;
-  
+
   class form {
   public:
-    
+
     // Default constructor
-    
+
     form() = default;
-    
+
     // Construct from database
-    
+
     form(const database& db, sqlite3_stmt* row);
-    
+
     // Accessors
-    
+
     operator bool() const
     {
       return valid_;
     }
-    
+
     int getId() const
     {
       if (!valid_)
       {
         throw std::domain_error("Bad access to uninitialized form");
       }
-      
+
       return id_;
     }
-    
+
     std::string getText() const
     {
       if (!valid_)
       {
         throw std::domain_error("Bad access to uninitialized form");
       }
-      
+
       return text_;
     }
-    
+
     int getComplexity() const
     {
       if (!valid_)
       {
         throw std::domain_error("Bad access to uninitialized form");
       }
-      
+
       return complexity_;
     }
-    
+
     bool isProper() const
     {
       if (!valid_)
       {
         throw std::domain_error("Bad access to uninitialized form");
       }
-      
+
       return proper_;
     }
-    
+
     const std::vector<pronunciation>& getPronunciations() const;
-    
+
+    // Convenience
+
+    bool startsWithVowelSound() const;
+
     // Type info
-    
+
     static const object objectType;
-    
+
     static const std::list<std::string> select;
-    
+
     // Query fields
-    
+
     static const field id;
     static const field text;
     static const field complexity;
     static const field proper;
-    
+
     operator filter() const
     {
       if (!valid_)
       {
         throw std::domain_error("Bad access to uninitialized form");
       }
-      
+
       return (id == id_);
     }
-    
+
     // Relationships to other objects
-    
+
     static const field pronunciation;
-    
+
     class inflection_field {
     public:
-      
+
       inflection_field(inflection category) : category_(category)
       {
       }
-      
+
       const inflection getCategory() const
       {
         return category_;
       }
       
     private:
-      
+
       const inflection category_;
     };
-    
+
     static const inflection_field lemma(inflection category)
     {
       return inflection_field(category);
     }
-    
+
     friend filter operator%=(form::inflection_field check, filter joinCondition);
-    
+
   private:
     bool valid_ = false;
-    
+
     int id_;
     std::string text_;
     int complexity_ ;
     bool proper_;
-    
+
     const database* db_;
-    
+
     mutable bool initializedPronunciations_ = false;
     mutable std::vector<class pronunciation> pronunciations_;
-    
+
     static const field lemmaJoin;
     static const field inflectionCategory;
-    
+
   };
-  
+
 };
 
 #endif /* end of include guard: FORM_H_3A6C962C */
-- 
cgit 1.4.1