chinwag 0.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f037f260def8f981e16426363f15335a45d71f62
-  data.tar.gz: a2c237a826e5cfa1aecc65531445e2d5a737539b
+  metadata.gz: 3fd89d4ee2f2e3439eb95d344a7ef538911055df
+  data.tar.gz: 0cccb667d03b4543f09dff77de8ed74d6bd2b8f3
 SHA512:
-  metadata.gz: 302dd52a58d2cdc8228dba88287973a0d0beed0b910b6a95e1e5f10ff9f5a3cc4bb3cc4cb29bb742b3b4f5d445efa588d6d8cf6725a4b4dd373936fad2208784
-  data.tar.gz: 2053ca937bb4069717797531075dcd3d9aeed574f0edf850c7a46ccff52bbe94f6f3ce2f0b15293747353f0ae00867fc88caf664eec237b00eaab4570e780567
+  metadata.gz: 4bfd5c4396ad161bc3c2b32f10bff6922551930dca19d9fcac58b279e12b689a27aa36802d6800b5dbdec2eb7fbcd485a4fc3a5cdc7d682e6df5806ac62c2dd7
+  data.tar.gz: a844beae99c7f6e6fd428a8373b7b7abf9030b2830cf49dd48511a80d867d8833023293ea1a119cc814d05f8914eeaa6cffbada31c65f37b5f4b7ca10f435da8

data/Rakefile

@@ -8,7 +8,7 @@ Rake::ExtensionTask.new "chinwag" do |ext|
   ext.lib_dir = "lib/chinwag"
 end
 
-s = Gem::Specification.new "chinwag", "0.1.5" do |s|
+s = Gem::Specification.new "chinwag", "1.2.0" do |s|
   s.authors = ["Chris Calo"]
   s.email = ["ccalo@vulcanca.com"]
   s.summary = "A text-synthesis library, for use in layout testing (and more)."

data/ext/chinwag/chinwag.c

@@ -1,6 +1,7 @@
 #include "chinwag.h"
 
-char* chinwag(cw_t type, unsigned long min, unsigned long max, dict_t dict)
+char* chinwag
+(cw_t type, unsigned long min, unsigned long max, cwdict_t dict)
 {
   char* result = NULL;
 
@@ -27,17 +28,18 @@ char* chinwag(cw_t type, unsigned long min, unsigned long max, dict_t dict)
     exit(EXIT_FAILURE);
   }
 
-  if(type == CW_LETTERS) result = ltr_rng(min, max, dict);
-  else if(type == CW_WORDS) result = wrd_rng(min, max, dict);
-  else if(type == CW_SENTENCES) result = snt_rng(min, max, dict);
-  else if(type == CW_PARAGRAPHS) result = pgf_rng(min, max, dict);
+  if(type == CW_LETTERS) result = cw_ltr_rng(min, max, dict);
+  else if(type == CW_WORDS) result = cw_wrd_rng(min, max, dict);
+  else if(type == CW_SENTENCES) result = cw_snt_rng(min, max, dict);
+  else if(type == CW_PARAGRAPHS) result = cw_pgf_rng(min, max, dict);
 
   return result;
 }
 
-char* ltr_rng(unsigned long min, unsigned long max, dict_t dict)
+char* cw_ltr_rng
+(unsigned long min, unsigned long max, cwdict_t dict)
 {
-  dict_t temp = open_dict();
+  cwdict_t temp = cwdict_open();
   I32 amount = motherr(min,max), total = 0; U32 len = 0;
   char* s = (char*)malloc(SMALL_BUFFER); char* sample = NULL; 
   char* result = NULL; char* vowels = "aeiou";
@@ -54,7 +56,7 @@ char* ltr_rng(unsigned long min, unsigned long max, dict_t dict)
     }
     else
     {
-      s = strcpy(s, sample_dict(dict));
+      s = strcpy(s, cwdict_sample(dict));
       len = strlen(s); total += len; s[len] = '\0';
       if(len > amount || include(s, " ") || include(s, "-")) continue;
     }
@@ -90,25 +92,26 @@ char* ltr_rng(unsigned long min, unsigned long max, dict_t dict)
       amount -= 2;
     }
 
-    temp = place_word_in_dict(temp, s);
+    temp = cwdict_place_word(temp, s);
     if(amount > 0 && amount != 1) --amount;
   }
 
   // post-process dict (pass utility::capitalize function as parameter)
-  temp = prune_dict(temp, false);
-  temp = map_dict(temp, capitalize);
-  result = join_dict(temp, " ");
+  temp = cwdict_prune(temp, false);
+  temp = cwdict_map(temp, capitalize);
+  result = cwdict_join(temp, " ");
 
-  close_dict(temp);
+  cwdict_close(temp);
   free(s); s = NULL;
 
   return result;
 }
 
-char* wrd_rng(unsigned long min, unsigned long max, dict_t dict)
+char* cw_wrd_rng
+(unsigned long min, unsigned long max, cwdict_t dict)
 {
-  dict_t temp = open_dict();
-  U32 amount = motherr(min, max), total = total_dict(dict);
+  cwdict_t temp = cwdict_open();
+  U32 amount = motherr(min, max), total = cwdict_length(dict);
   char* sample = NULL; char* result = NULL;
   bool invalid = true;
 
@@ -117,32 +120,33 @@ char* wrd_rng(unsigned long min, unsigned long max, dict_t dict)
   {
     while(invalid)
     {
-      sample = sample_dict(dict);
+      sample = cwdict_sample(dict);
 
       // valid if no space, hyphen, or duplicate (latter depends on size)
       if(exclude(sample, " ") && exclude(sample, "-"))
       {
         if(amount > total) invalid = false;
-        else if(dict_exclude(temp, sample)) invalid = false;
+        else if(cwdict_exclude(temp, sample)) invalid = false;
       }
     }
     
-    temp = place_word_in_dict(temp, sample);
+    temp = cwdict_place_word(temp, sample);
     invalid = true;
   }
 
   // post-process dict (pass utility::capitalize function as parameter)
-  temp = map_dict(temp, capitalize);
-  result = join_dict(temp, " ");
+  temp = cwdict_map(temp, capitalize);
+  result = cwdict_join(temp, " ");
 
-  close_dict(temp);
+  cwdict_close(temp);
 
   return result;
 }
 
-char* snt_rng(unsigned long min, unsigned long max, dict_t dict)
+char* cw_snt_rng
+(unsigned long min, unsigned long max, cwdict_t dict)
 {
-  dict_t master = open_dict(), temp; drow_t selected;
+  cwdict_t master = cwdict_open(), temp; cwdrow_t selected;
   U32 word_amount = 0, last = 0, amount = motherr(min, max), now = 0, 
   len = 0, t_minus = 0; U8 comma = 0; I32 punct = 0;
   U32* no_dice = (U32*)malloc(sizeof(U32) * SMALL_BUFFER);
@@ -151,7 +155,7 @@ char* snt_rng(unsigned long min, unsigned long max, dict_t dict)
 
   for(U32 i = 0; i != amount; ++i)
   {
-    temp = open_dict();
+    temp = cwdict_open();
     word_amount = motherr(SENTENCE_MIN_WORD_LENGTH, 
     SENTENCE_MAX_WORD_LENGTH);
 
@@ -170,10 +174,10 @@ char* snt_rng(unsigned long min, unsigned long max, dict_t dict)
       else if(last > 10 || last <= 2) { now = motherr(6, 10); t_minus = 3; }
 
       selected = dict.drows[now];
-      sample = sample_drow(selected);
+      sample = cwdrow_sample(selected);
 
-      while(dict_include(temp, sample) && strlen(sample) != now)
-      { sample = sample_dict(dict); }
+      while(cwdict_include(temp, sample) && strlen(sample) != now)
+      { sample = cwdict_sample(dict); }
 
       // add comma (if applicable)
       if(comma && j == comma - 1)
@@ -186,18 +190,18 @@ char* snt_rng(unsigned long min, unsigned long max, dict_t dict)
         s[len] = '\0';
 
         s = add_suffix(s, ",");
-        temp = place_word_in_dict(temp, s);
+        temp = cwdict_place_word(temp, s);
 
         free(s);
       }
-      else temp = place_word_in_dict(temp, sample);
+      else temp = cwdict_place_word(temp, sample);
 
       invalid = true;
       last = now;
     }
 
     // join temporary dict into a sentence; capitalize first word
-    s = join_dict(temp, " ");
+    s = cwdict_join(temp, " ");
     s = capitalize(s);
 
     // determine punctuation; 1 - period, 2 - question, 3 - exclamation
@@ -209,38 +213,39 @@ char* snt_rng(unsigned long min, unsigned long max, dict_t dict)
     else if(punct >= 85 && punct <= 99) s = add_suffix(s, "!");
 
     // add sentence to master dict and cleanup
-    master = place_word_in_dict(master, s);
+    master = cwdict_place_word(master, s);
 
-    close_dict(temp);
+    cwdict_close(temp);
     free(s);
   }
 
-  result = join_dict(master, " ");
-  close_dict(master);
+  result = cwdict_join(master, " ");
+  cwdict_close(master);
   free(no_dice);
 
   return result;
 }
 
-char* pgf_rng(unsigned long min, unsigned long max, dict_t dict)
+char* cw_pgf_rng
+(unsigned long min, unsigned long max, cwdict_t dict)
 {
   char* result = NULL; char* sentences = NULL;
   U32 amount = motherr(min, max), sentence_amount = 0;
-  dict_t master = open_dict();
+  cwdict_t master = cwdict_open();
 
   for(U32 i = 0; i != amount; ++i)
   {
     sentence_amount = motherr(PARAGRAPH_MIN_SENTENCE_LENGTH, 
     PARAGRAPH_MAX_SENTENCE_LENGTH);
 
-    sentences = snt(sentence_amount, dict);
-    master = place_word_in_dict(master, sentences);
+    sentences = cw_snt(sentence_amount, dict);
+    master = cwdict_place_word(master, sentences);
 
     free(sentences);
   }
 
-  result = join_dict(master, "\n\n");
-  close_dict(master);
+  result = cwdict_join(master, "\n\n");
+  cwdict_close(master);
 
   return result;
 }

data/ext/chinwag/chinwag.h

@@ -36,15 +36,15 @@ typedef struct dictionary_type {
   unsigned long largest;
   unsigned long largest_pos;
   char** words;
-} drow_t;
+} cwdrow_t;
 
 // dictionary (row container)
 typedef struct dictionary_container_type {
   bool sorted;
   unsigned long count;
-  drow_t* drows;
+  cwdrow_t* drows;
   char* name;
-} dict_t;
+} cwdict_t;
 
 #include "seuss.h"
 #include "latin.h"
@@ -56,16 +56,24 @@ typedef struct dictionary_container_type {
 #include "config.h"
 #include "dict.h"
 
-char* chinwag(cw_t type, unsigned long min, unsigned long max, dict_t dict);
+char* chinwag
+(cw_t type, unsigned long min, unsigned long max, cwdict_t dict);
 
-#define ltr(amt, dict) ltr_rng(amt, amt, dict)
-#define wrd(amt, dict) wrd_rng(amt, amt, dict)
-#define snt(amt, dict) snt_rng(amt, amt, dict)
-#define pgf(amt, dict) pgf_rng(amt, amt, dict)
+char* cw_ltr_rng
+(unsigned long min, unsigned long max, cwdict_t dict);
 
-char* ltr_rng(unsigned long min, unsigned long max, dict_t dict);
-char* wrd_rng(unsigned long min, unsigned long max, dict_t dict);
-char* snt_rng(unsigned long min, unsigned long max, dict_t dict);
-char* pgf_rng(unsigned long min, unsigned long max, dict_t dict);
+char* cw_wrd_rng
+(unsigned long min, unsigned long max, cwdict_t dict);
+
+char* cw_snt_rng
+(unsigned long min, unsigned long max, cwdict_t dict);
+
+char* cw_pgf_rng
+(unsigned long min, unsigned long max, cwdict_t dict);
+
+#define cw_ltr(amt, dict) cw_ltr_rng(amt, amt, dict)
+#define cw_wrd(amt, dict) cw_wrd_rng(amt, amt, dict)
+#define cw_snt(amt, dict) cw_snt_rng(amt, amt, dict)
+#define cw_pgf(amt, dict) cw_pgf_rng(amt, amt, dict)
 
 #endif

data/ext/chinwag/config.c

@@ -1,13 +1,13 @@
 #include "config.h"
 
 const unsigned MAJOR_VERSION = 1;
-const unsigned MINOR_VERSION = 1;
-const unsigned PATCH_VERSION = 4;
+const unsigned MINOR_VERSION = 2;
+const unsigned PATCH_VERSION = 0;
 
-const char* const DATE_YEAR = "2014";
-const char* const DATE_MONTH = "12";
-const char* const DATE_DAY = "02";
-const char* const REVISION = "743";
+const char* const DATE_YEAR = "2015";
+const char* const DATE_MONTH = "01";
+const char* const DATE_DAY = "03";
+const char* const REVISION = "914";
 
 const unsigned SMALL_BUFFER = 1024;
 const unsigned LARGE_BUFFER = 5120;