Nouns with any uppercase letters are now considered proper

2 files changed, 18 insertions, 2 deletions

@@ -330,6 +330,13 @@ namespace verbly {
     return *this;
   }
   
+  noun_query& noun_query::is_instance(bool _arg)
+  {
+    _is_instance = _arg;
+    
+    return *this;
+  }
+  
   noun_query& noun_query::instance_of(const noun& _noun)
   {
     _instance_of.push_back(_noun);
@@ -644,12 +651,17 @@ namespace verbly {
     
     if (_is_proper)
     {
-      conditions.push_back("noun_id IN (SELECT instance_id FROM instantiation)");
+      conditions.push_back("proper = 1");
     }
     
     if (_is_not_proper)
     {
-      conditions.push_back("noun_id NOT IN (SELECT instance_id FROM instantiation)");
+      conditions.push_back("proper = 0");
+    }
+    
+    if (_is_instance)
+    {
+      conditions.push_back("noun_id IN (SELECT instance_id FROM instantiation)");
     }
     
     if (!_instance_of.empty())
@@ -79,6 +79,8 @@ namespace verbly {
       
       noun_query& is_proper(bool _arg);
       noun_query& is_not_proper(bool _arg);
+      
+      noun_query& is_instance(bool _arg);
       noun_query& instance_of(const noun& _noun);
       noun_query& not_instance_of(const noun& _noun);
       
@@ -149,6 +151,8 @@ namespace verbly {
       
       bool _is_proper = false;
       bool _is_not_proper = false;
+      
+      bool _is_instance = false;
       std::list<noun> _instance_of;
       std::list<noun> _not_instance_of;